diff options
| author | 2022-10-06 20:09:23 +0000 | |
|---|---|---|
| committer | 2022-10-06 20:09:23 +0000 | |
| commit | bd08d0e3973b21c0c8773afb9c1fc2a61d04fbe3 (patch) | |
| tree | a4fe0ef40985d5681dd7cb0c1eb0940080ec966b /tools/aapt2/ResourceUtils.cpp | |
| parent | f453531a385d3f9ea45e81fa7a6b3265c744d210 (diff) | |
| parent | 9f339eb21b049c79467e81d85518ca16c5d6aac3 (diff) | |
Merge "Fix stack-use-after-scope for a `std::string`" am: 165a7640cf am: 9f339eb21b
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>
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index 23f6c88aad91..3787f3b96f08 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -51,8 +51,10 @@ std::optional<ResourceName> ToResourceName(const android::ResTable::resource_nam util::Utf16ToUtf8(StringPiece16(name_in.package, name_in.packageLen)); std::optional<ResourceNamedTypeRef> type; + std::string converted; 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) { type = ParseResourceNamedType(StringPiece(name_in.type8, name_in.typeLen)); } 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); std::optional<ResourceNamedTypeRef> type; + std::string converted; if (name_in.type16) { - type = - ParseResourceNamedType(util::Utf16ToUtf8(StringPiece16(name_in.type16, name_in.type_len))); + converted = util::Utf16ToUtf8(StringPiece16(name_in.type16, name_in.type_len)); + type = ParseResourceNamedType(converted); } else if (name_in.type) { type = ParseResourceNamedType(StringPiece(name_in.type, name_in.type_len)); } else { |