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" am: 165a7640cf am: 9f339eb21b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2241510

Change-Id: I736bfb19fa3035d60f41b289837597994e753706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-06 20:09:23 +00:00
committed by Automerger Merge Worker
parent f453531a38 9f339eb21b
commit bd08d0e397
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt2/ResourceUtils.cpp
View File

@@ -51,8 +51,10 @@ std::optional<ResourceName> ToResourceName(const android::ResTable::resource_nam
util::Utf16ToUtf8(StringPiece16(name_in.package, name_in.packageLen)); util::Utf16ToUtf8(StringPiece16(name_in.package, name_in.packageLen));
std::optional<ResourceNamedTypeRef> type; std::optional<ResourceNamedTypeRef> type;
std::string converted;
if (name_in.type) { if (name_in.type) {
type = ParseResourceNamedType(util::Utf16ToUtf8(StringPiece16(name_in.type, name_in.typeLen))); converted = util::Utf16ToUtf8(StringPiece16(name_in.type, name_in.typeLen));
type = ParseResourceNamedType(converted);
} else if (name_in.type8) { } else if (name_in.type8) {
type = ParseResourceNamedType(StringPiece(name_in.type8, name_in.typeLen)); type = ParseResourceNamedType(StringPiece(name_in.type8, name_in.typeLen));
} else { } else {
@@ -85,9 +87,10 @@ std::optional<ResourceName> ToResourceName(const android::AssetManager2::Resourc
name_out.package = std::string(name_in.package, name_in.package_len); name_out.package = std::string(name_in.package, name_in.package_len);
std::optional<ResourceNamedTypeRef> type; std::optional<ResourceNamedTypeRef> type;
std::string converted;
if (name_in.type16) { if (name_in.type16) {
type = converted = util::Utf16ToUtf8(StringPiece16(name_in.type16, name_in.type_len));
ParseResourceNamedType(util::Utf16ToUtf8(StringPiece16(name_in.type16, name_in.type_len))); type = ParseResourceNamedType(converted);
} else if (name_in.type) { } else if (name_in.type) {
type = ParseResourceNamedType(StringPiece(name_in.type, name_in.type_len)); type = ParseResourceNamedType(StringPiece(name_in.type, name_in.type_len));
} else { } else {