From 4425c1d960234ae5db904b199ccf39c4ec64b37f Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 10 Feb 2016 13:47:32 -0800 Subject: Fix some memory leaks. Bug: 26906328 Change-Id: Iebaf03db0cb3054f91715f8c849be6087d01b27b --- install.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'install.cpp') 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(args)); fprintf(stdout, "E:Can't run %s (%s)\n", binary, strerror(errno)); _exit(-1); } -- cgit v1.2.3