summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2016-02-18 20:32:10 +0100
committerYabin Cui <yabinc@google.com>2016-02-18 23:07:36 +0100
commita029c9a45888141a2fa382e0b1868e55db1f36d2 (patch)
tree1ee2461dbe4fa8711298ce4ad36ae3c49640afae /updater
parentMerge commit \'ce46828e08281dc507d4e40ba9e8b770bc21cf0b\' into HEAD (diff)
downloadandroid_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar.gz
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar.bz2
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar.lz
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar.xz
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.tar.zst
android_bootable_recovery-a029c9a45888141a2fa382e0b1868e55db1f36d2.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/updater.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/updater/updater.cpp b/updater/updater.cpp
index 0f22e6d04..80e75037c 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -19,6 +19,8 @@
#include <stdlib.h>
#include <string.h>
+#include <string>
+
#include "edify/expr.h"
#include "updater.h"
#include "install.h"
@@ -89,12 +91,11 @@ int main(int argc, char** argv) {
return 4;
}
- char* script = reinterpret_cast<char*>(malloc(script_entry->uncompLen+1));
- if (!mzReadZipEntry(&za, script_entry, script, script_entry->uncompLen)) {
+ std::string script(script_entry->uncompLen, '\0');
+ if (!mzReadZipEntry(&za, script_entry, &script[0], script_entry->uncompLen)) {
printf("failed to read script from package\n");
return 5;
}
- script[script_entry->uncompLen] = '\0';
// Configure edify's functions.
@@ -108,7 +109,7 @@ int main(int argc, char** argv) {
Expr* root;
int error_count = 0;
- int error = parse_string(script, &root, &error_count);
+ int error = parse_string(script.c_str(), &root, &error_count);
if (error != 0 || error_count > 0) {
printf("%d parse errors\n", error_count);
return 6;
@@ -135,7 +136,7 @@ int main(int argc, char** argv) {
State state;
state.cookie = &updater_info;
- state.script = script;
+ state.script = &script[0];
state.errmsg = NULL;
char* result = Evaluate(&state, root);
@@ -163,7 +164,5 @@ int main(int argc, char** argv) {
mzCloseZipArchive(updater_info.package_zip);
}
sysReleaseMap(&map);
- free(script);
-
return 0;
}