From d0de070a390d4825cbbb6eeed5433720045f26eb Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 29 Nov 2016 11:54:04 -0800
Subject: updater: Fix inconsistent code.

Commit 81e54eddd4132895d70ab8b2307c693311799e05 introduced the
inconsistency when resolving the merge conflict into master.

Test: mmma bootable/recovery
Change-Id: I43b7ec76a7eee000708cdca60bd372173e1fac2f
---
 updater/updater.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/updater/updater.cpp b/updater/updater.cpp
index 46de9ad09..7327c52e3 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -105,7 +105,8 @@ int main(int argc, char** argv) {
         return 4;
     }
 
-    std::string script(script_entry.uncompressed_length, '\0');
+    std::string script;
+    script.resize(script_entry.uncompressed_length);
     int extract_err = ExtractToMemory(za, &script_entry, reinterpret_cast<uint8_t*>(&script[0]),
                                       script_entry.uncompressed_length);
     if (extract_err != 0) {
@@ -209,5 +210,6 @@ int main(int argc, char** argv) {
         CloseArchive(updater_info.package_zip);
     }
     sysReleaseMap(&map);
+
     return 0;
 }
-- 
cgit v1.2.3