commit ac6a9b802df83f913f9f4f4c134f9da20e2f6018
author David Anderson <dvander@google.com> Fri Dec 03 20:08:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 03 20:08:04 2021 +0000
tree 0d049e09373c2ba0d7990b9daa316498ded65690
parent 711fe85f4034aa4ee4b8d8bcf6a8ac9c4923a4e0
parent 9153f7f4b3941384831f9d16d55492099315cd27

Merge "libsnapshot: Fix crash in MakeXorBlockString test." am: 35cbd4d472 am: 9153f7f4b3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1909111

Change-Id: I7bccd9b2cac8940bdac86e23e17ab221a26e7677

fs_mgr/libsnapshot/snapshot_reader_test.cpp

diff --git a/fs_mgr/libsnapshot/snapshot_reader_test.cpp b/fs_mgr/libsnapshot/snapshot_reader_test.cpp
index 078f16e..9adc655 100644
--- a/fs_mgr/libsnapshot/snapshot_reader_test.cpp
+++ b/fs_mgr/libsnapshot/snapshot_reader_test.cpp
@@ -155,8 +155,8 @@
     }
 
     std::string MakeXorBlockString() {
-        std::string data(100, -1);
-        data.resize(kBlockSize, 0);
+        std::string data(kBlockSize, 0);
+        memset(data.data(), 0xff, 100);
         return data;
     }