openharmony/global_i18n
1
0
Fork 0
mirror of https://gitee.com/openharmony/global_i18n synced 2024-11-27 17:21:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dlclose()空指针导致crash

Browse Source 
Signed-off-by: zhangdd_ewan <zhangdongdong50@huawei.com>
This commit is contained in:
zhangdd_ewan 2023-12-18 10:40:58 +08:00
parent bf638126d7
commit 3e2e6fcc3b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frameworks/intl/src/phone_number_format.cpp
View File

@ -19,6 +19,7 @@
#include "localebuilder.h"
#include "locale_config.h"
#include "locid.h"
#include "hilog/log.h"
#include "map"
#include "new"
#include "set"
@ -33,6 +34,8 @@ namespace Global {
namespace I18n {
const int RECV_CHAR_LEN = 128;
using i18n::phonenumbers::PhoneNumberUtil;
static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, 0xD001E00, "PhoneNumberFormat" };
using namespace OHOS::HiviewDFX;
PhoneNumberFormat::PhoneNumberFormat(const std::string &countryTag,
const std::map<std::string, std::string> &options)
@ -164,6 +167,7 @@ std::string PhoneNumberFormat::getPhoneLocationName(const std::string& number, c
{
OpenHandler();
if (dynamicHandler && !locationNameFunc) {
HiLog::Error(LABEL, "LocationNameFunc Init");
locationNameFunc = reinterpret_cast<ExposeLocationName>(dlsym(dynamicHandler, "exposeLocationName"));
}
std::string locName;
@ -182,6 +186,7 @@ std::string PhoneNumberFormat::getPhoneLocationName(const std::string& number, c
void PhoneNumberFormat::OpenHandler()
{
if (dynamicHandler == nullptr) {
HiLog::Info(LABEL, "DynamicHandler init.");
#ifndef SUPPORT_ASAN
const char* geocodingSO = "libgeocoding.z.so";
#else
@ -189,6 +194,7 @@ void PhoneNumberFormat::OpenHandler()
#endif
std::lock_guard<std::mutex> phoneLock(phoneMutex);
if (dynamicHandler == nullptr) {
HiLog::Info(LABEL, "DynamicHandler lock init.");
dynamicHandler = dlopen(geocodingSO, RTLD_NOW);
}
}