openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 01:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

回退 'Pull Request !45869 : 【drawable】【安全告警】stoul用from_chars处理'

Browse Source
This commit is contained in:
oh_ci 2024-10-16 01:47:13 +00:00 committed by Gitee
parent bc4cc813ba
commit 9627922b7f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
interfaces/inner_api/drawable_descriptor/drawable_descriptor.cpp
View File

@ -16,9 +16,6 @@
#if defined(ANDROID_PLATFORM) || defined(IOS_PLATFORM)
#include "application_context.h"
#endif
#include <charconv>
#include <system_error>
#include "drawable_descriptor.h"
#include "third_party/cJSON/cJSON.h"
#ifndef PREVIEW
@ -85,20 +82,6 @@ inline bool IsNumber(const std::string& value)
}
return std::all_of(value.begin(), value.end(), [](char i) { return isdigit(i); });
}
bool ConvertStringToUInt32(const std::string& idStr, uint32_t& result)
{
auto [ptr, ec] = std::from_chars(idStr.data(), idStr.data() + idStr.size(), result);
if (ec == std::errc()) {
return true;
} else if (ec == std::errc::invalid_argument) {
HILOGE("Invalid argument: unable to convert string to uint32_t");
} else if (ec == std::errc::result_out_of_range) {
HILOGE("Out of range: string value is too large for uint32_t");
}
return false;
}
} // namespace
DrawableItem LayeredDrawableDescriptor::PreGetDrawableItem(
@ -112,11 +95,10 @@ DrawableItem LayeredDrawableDescriptor::PreGetDrawableItem(
}
std::tuple<std::string, size_t, std::string> info;
uint32_t resourceId = 0;
if (ConvertStringToUInt32(idStr, resourceId)) {
resItem.state_ = resourceMgr->GetDrawableInfoById(resourceId, info, resItem.data_, iconType_, density_);
}
auto state = resourceMgr->GetDrawableInfoById(
static_cast<uint32_t>(std::stoul(idStr)), info, resItem.data_, iconType_, density_);
resItem.len_ = std::get<1>(info);
resItem.state_ = state;
return resItem;
}