Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix stack-use-after-scope for a std::string"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-05 14:03:05 +00:00
committed by Android (Google) Code Review
parent 2b6bae0009 eb39a51194
commit 10bf49f4be
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt2/ResourceUtils.cpp
View File

@@ -43,8 +43,9 @@ namespace ResourceUtils {
static std::optional<ResourceNamedType> ToResourceNamedType(const char16_t* type16,
const char* type, size_t type_len) {
std::optional<ResourceNamedTypeRef> parsed_type;
std::string converted;
if (type16) {
auto converted = android::util::Utf16ToUtf8(StringPiece16(type16, type_len));
converted = android::util::Utf16ToUtf8(StringPiece16(type16, type_len));
parsed_type = ParseResourceNamedType(converted);
} else if (type) {
parsed_type = ParseResourceNamedType(StringPiece(type, type_len));