summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2025-03-12 04:16:42 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-12 04:16:42 -0700
commit07c6be11190fb563ca775d954577e77ee5f9398d (patch)
tree8155c577093b44f2a14527ba8e3b55bc76c14c18
parent9cb143a2b53c4e7dd9a53fb042e77b89bbc7966a (diff)
parent559dc0868345d955d3801a7acfa206f35343acdf (diff)
Fix string truncation for oat key value store. am: 559dc08683
Original change: https://android-review.googlesource.com/c/platform/art/+/3535325 Change-Id: I5b9a46f8e2fc95f5461b476f0539b7e65948ec51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--dex2oat/linker/oat_writer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc
index 6cdfe7bb40..6bd9e57725 100644
--- a/dex2oat/linker/oat_writer.cc
+++ b/dex2oat/linker/oat_writer.cc
@@ -121,8 +121,8 @@ bool OatKeyValueStore::PutNonDeterministic(const std::string& k,
return true;
}
if (allow_truncation) {
- LOG(WARNING) << "Key value store field " << k << "too long. Truncating";
- map_.Put(k, v.substr(length));
+ LOG(WARNING) << "Key value store field " << k << " too long. Truncating";
+ map_.Put(k, v.substr(/*pos=*/0, length));
return true;
}
return false;