commit 565273839e8ed1af8a938b26d9ec57d5fb1b20cf
author Tao Bao <tbao@google.com> Tue Oct 25 02:48:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 02:48:54 2016 +0000
tree 73602006c06136345e84b9fb7b711206ffdf1fdc
parent a866b12c2d8254b3c84a3752b728d70d219cede7
parent e1991428badd05d759990b9d5daad4080772a32d

Merge "applypatch: Fix the bug when constructing VAL_BLOB."
am: e1991428ba

Change-Id: I354b9535077cf4dfbda78c731ac41cba015e8805

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,