summaryrefslogtreecommitdiffstats
path: root/install.cpp
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2016-02-10 22:47:32 +0100
committerYabin Cui <yabinc@google.com>2016-02-11 00:32:19 +0100
commit4425c1d960234ae5db904b199ccf39c4ec64b37f (patch)
treedf49745acfb355aefb64c160a04ba47bb63dda5b /install.cpp
parentMerge "verifier_test: Suppress the unused parameter warnings." (diff)
downloadandroid_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar.gz
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar.bz2
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar.lz
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar.xz
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.tar.zst
android_bootable_recovery-4425c1d960234ae5db904b199ccf39c4ec64b37f.zip
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/install.cpp b/install.cpp
index c0d007709..33c1f5498 100644
--- a/install.cpp
+++ b/install.cpp
@@ -124,20 +124,20 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) {
// - the name of the package zip file.
//
- const char** args = (const char**)malloc(sizeof(char*) * 5);
+ const char* args[5];
args[0] = binary;
args[1] = EXPAND(RECOVERY_API_VERSION); // defined in Android.mk
- char* temp = (char*)malloc(10);
- sprintf(temp, "%d", pipefd[1]);
+ char temp[16];
+ snprintf(temp, sizeof(temp), "%d", pipefd[1]);
args[2] = temp;
- args[3] = (char*)path;
+ args[3] = path;
args[4] = NULL;
pid_t pid = fork();
if (pid == 0) {
umask(022);
close(pipefd[0]);
- execv(binary, (char* const*)args);
+ execv(binary, const_cast<char**>(args));
fprintf(stdout, "E:Can't run %s (%s)\n", binary, strerror(errno));
_exit(-1);
}