Skip to content

Display and control your Android device

Replace VLA by dynamic allocation

Wirtos_newa9d9cbf8b502
diff --git a/app/src/adb.c b/app/src/adb.c
index 44c80be6..5bb9df30 100644
--- a/app/src/adb.c
+++ b/app/src/adb.c
@@ -81,14 +81,20 @@ show_adb_installation_msg() {
static void
show_adb_err_msg(enum process_result err, const char *const argv[]) {
- char buf[512];
+#define MAX_COMMAND_STRING_LEN 1024
+ char *buf = malloc(MAX_COMMAND_STRING_LEN);
+ if (!buf) {
+ LOGE("Failed to execute (could not allocate error message)");
+ return;
+ }
+
switch (err) {
case PROCESS_ERROR_GENERIC:
- argv_to_string(argv, buf, sizeof(buf));
+ argv_to_string(argv, buf, MAX_COMMAND_STRING_LEN);
LOGE("Failed to execute: %s", buf);
break;
case PROCESS_ERROR_MISSING_BINARY:
- argv_to_string(argv, buf, sizeof(buf));
+ argv_to_string(argv, buf, MAX_COMMAND_STRING_LEN);
LOGE("Command not found: %s", buf);
LOGE("(make 'adb' accessible from your PATH or define its full"
"path in the ADB environment variable)");
@@ -98,13 +104,20 @@ show_adb_err_msg(enum process_result err, const char *const argv[]) {
// do nothing
break;
}
+
+ free(buf);
}
process_t
adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
- const char *argv[len + 4];
int i;
process_t process;
+
+ const char **argv = malloc((len + 4) * sizeof(*argv));
+ if (!argv) {
+ return PROCESS_NONE;
+ }
+
argv[0] = get_adb_command();
if (serial) {
argv[1] = "-s";
@@ -119,8 +132,10 @@ adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
enum process_result r = process_execute(argv, &process);
if (r != PROCESS_SUCCESS) {
show_adb_err_msg(r, argv);
- return PROCESS_NONE;
+ process = PROCESS_NONE;
}
+
+ free(argv);
return process;
}
diff --git a/app/src/sys/win/process.c b/app/src/sys/win/process.c
index 7f5da6af..aafd5d34 100644
--- a/app/src/sys/win/process.c
+++ b/app/src/sys/win/process.c
@@ -6,6 +6,8 @@
#include "util/log.h"
#include "util/str_util.h"
+#define CMD_MAX_LEN 8192
+
static bool
build_cmd(char *cmd, size_t len, const char *const argv[]) {
// Windows command-line parsing is WTF:
@@ -27,13 +29,14 @@ process_execute(const char *const argv[], HANDLE *handle) {
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
- char cmd[256];
- if (!build_cmd(cmd, sizeof(cmd), argv)) {
+ char *cmd = malloc(CMD_MAX_LEN);
+ if (!cmd || !build_cmd(cmd, CMD_MAX_LEN, argv)) {
*handle = NULL;
return PROCESS_ERROR_GENERIC;
}
wchar_t *wide = utf8_to_wide_char(cmd);
+ free(cmd);
if (!wide) {
LOGC("Could not allocate wide char string");
return PROCESS_ERROR_GENERIC;