PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "minadbd: use strdup() to create argument for sideload thread."

Browse Source
This commit is contained in:
Yabin Cui
2015-09-30 17:43:59 +00:00
committed by Gerrit Code Review
parent 2bdac629f1 c8a3c80603
commit 4b66a280d3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minadbd/services.cpp
+4 -2
View File
@@ -43,13 +43,14 @@ void* service_bootstrap_func(void* x) {
} }
static void sideload_host_service(int sfd, void* data) { static void sideload_host_service(int sfd, void* data) {
const char* args = reinterpret_cast<const char*>(data); char* args = reinterpret_cast<char*>(data);
int file_size; int file_size;
int block_size; int block_size;
if (sscanf(args, "%d:%d", &file_size, &block_size) != 2) { if (sscanf(args, "%d:%d", &file_size, &block_size) != 2) {
printf("bad sideload-host arguments: %s\n", args); printf("bad sideload-host arguments: %s\n", args);
exit(1); exit(1);
} }
free(args);
printf("sideload-host file size %d block size %d\n", file_size, block_size); printf("sideload-host file size %d block size %d\n", file_size, block_size);
@@ -94,7 +95,8 @@ int service_to_fd(const char* name, const atransport* transport) {
// sideload-host). // sideload-host).
exit(3); exit(3);
} else if (!strncmp(name, "sideload-host:", 14)) { } else if (!strncmp(name, "sideload-host:", 14)) {
ret = create_service_thread(sideload_host_service, (void*)(name + 14)); char* arg = strdup(name + 14);
ret = create_service_thread(sideload_host_service, arg);
} }
if (ret >= 0) { if (ret >= 0) {
close_on_exec(ret); close_on_exec(ret);