commit 776651cc5b2d4db207139c27664e5a021b6c5273
author Tao Bao <tbao@google.com> Tue Oct 25 02:56:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 02:56:24 2016 +0000
tree 04a9f465e311d37eb6a892a92b9c3dab9f2627cf
parent 5e0b58789621dca3b25d9c934e47f4dab8256a93
parent 6d9f8993b0081645ee09c2d9364c110970c0cc30

Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e
am: 6d9f8993b0

Change-Id: I900afd26eb8767ce4a8f2362b6674af8d4a7f212

applypatch/main.cpp

diff --git a/applypatch/main.cpp b/applypatch/main.cpp
index a3a45d0..294f7ee 100644
--- a/applypatch/main.cpp
+++ b/applypatch/main.cpp
@@ -99,7 +99,7 @@
             return 1;
         }
         bonus.type = VAL_BLOB;
-        bonus.data = reinterpret_cast<const char*>(bonusFc.data.data());
+        bonus.data = std::string(bonusFc.data.cbegin(), bonusFc.data.cend());
         argc -= 2;
         argv += 2;
     }
@@ -132,7 +132,8 @@
     std::vector<Value> patches;
     std::vector<Value*> patch_ptrs;
     for (size_t i = 0; i < files.size(); ++i) {
-        patches.push_back(Value(VAL_BLOB, reinterpret_cast<const char*>(files[i].data.data())));
+        patches.push_back(Value(VAL_BLOB,
+                                std::string(files[i].data.cbegin(), files[i].data.cend())));
         patch_ptrs.push_back(&patches[i]);
     }
     return applypatch(argv[1], argv[2], argv[3], target_size,