Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f339eb2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix stack-use-after-scope for a `std::string`" am: 165a7640 

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



Change-Id: I7814bdb172605158c3930393669c46862d463fb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20fedd9d 165a7640

tools/aapt2/ResourceUtils.cpp

+6 −3
Original line number Diff line number Diff line
@@ -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 {