From 57219da7c6d1294f1a9ad7a7b87dc155984848d3 Mon Sep 17 00:00:00 2001
From: Wirtos_new <Wirtos.new@gmail.com>
Date: Sat, 19 Jun 2021 18:47:57 +0300
Subject: [PATCH] dynamically allocate CMD_MAX for subprocess and adb error
 message

---
 app/src/adb.c             | 29 +++++++++++++++++------------
 app/src/sys/win/process.c | 34 ++++++++++++++++++++++++----------
 app/src/util/process.h    |  3 ++-
 3 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/app/src/adb.c b/app/src/adb.c
index be973c41..605ebd79 100644
--- a/app/src/adb.c
+++ b/app/src/adb.c
@@ -81,14 +81,15 @@ show_adb_installation_msg() {
 
 static void
 show_adb_err_msg(enum process_result err, const char *const argv[]) {
-    char buf[512];
+    char *buf = malloc(CMD_MAX);
+    if (!buf) return;
     switch (err) {
         case PROCESS_ERROR_GENERIC:
-            argv_to_string(argv, buf, sizeof(buf));
+            argv_to_string(argv, buf, CMD_MAX);
             LOGE("Failed to execute: %s", buf);
             break;
         case PROCESS_ERROR_MISSING_BINARY:
-            argv_to_string(argv, buf, sizeof(buf));
+            argv_to_string(argv, buf, CMD_MAX);
             LOGE("Command not found: %s", buf);
             LOGE("(make 'adb' accessible from your PATH or define its full"
                  "path in the ADB environment variable)");
@@ -98,29 +99,33 @@ 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 *cmd[len + 4];
+    const char **argv;
     int i;
     process_t process;
-    cmd[0] = get_adb_command();
+    argv = malloc(sizeof(char *) * (len + 3 + 1));
+    if (!argv) return PROCESS_NONE;
+    argv[0] = get_adb_command();
     if (serial) {
-        cmd[1] = "-s";
-        cmd[2] = serial;
+        argv[1] = "-s";
+        argv[2] = serial;
         i = 3;
     } else {
         i = 1;
     }
 
-    memcpy(&cmd[i], adb_cmd, len * sizeof(const char *));
-    cmd[len + i] = NULL;
-    enum process_result r = process_execute(cmd, &process);
+    memcpy(&argv[i], adb_cmd, len * sizeof(const char *));
+    argv[len + i] = NULL;
+    enum process_result r = process_execute(argv, &process);
     if (r != PROCESS_SUCCESS) {
-        show_adb_err_msg(r, cmd);
-        return PROCESS_NONE;
+        show_adb_err_msg(r, argv);
+        process = PROCESS_NONE;
     }
+    free(argv);
     return process;
 }
 
diff --git a/app/src/sys/win/process.c b/app/src/sys/win/process.c
index f170e40d..5692a9d3 100644
--- a/app/src/sys/win/process.c
+++ b/app/src/sys/win/process.c
@@ -6,6 +6,11 @@
 #include "util/log.h"
 #include "util/str_util.h"
 
+#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
+
 static int
 build_cmd(char *cmd, size_t len, const char *const argv[]) {
     // Windows command-line parsing is WTF:
@@ -24,34 +29,43 @@ enum process_result
 process_execute(const char *const argv[], HANDLE *handle) {
     STARTUPINFOW si;
     PROCESS_INFORMATION pi;
+    enum process_result res = PROCESS_SUCCESS;
+    wchar_t *wide = NULL;
+    char *cmd = NULL;
     memset(&si, 0, sizeof(si));
     si.cb = sizeof(si);
 
-    char cmd[256];
-    if (build_cmd(cmd, sizeof(cmd), argv)) {
+    cmd = malloc(CMD_MAX);
+    if (cmd == NULL || build_cmd(cmd, CMD_MAX, argv) != 0) {
         *handle = NULL;
-        return PROCESS_ERROR_GENERIC;
+        res = PROCESS_ERROR_GENERIC;
+        goto end;
     }
 
-    wchar_t *wide = utf8_to_wide_char(cmd);
+    wide = utf8_to_wide_char(cmd);
     if (!wide) {
         LOGC("Could not allocate wide char string");
-        return PROCESS_ERROR_GENERIC;
+        res = PROCESS_ERROR_GENERIC;
+        goto end;
     }
 
     if (!CreateProcessW(NULL, wide, NULL, NULL, FALSE, 0, NULL, NULL, &si,
                         &pi)) {
-        free(wide);
         *handle = NULL;
         if (GetLastError() == ERROR_FILE_NOT_FOUND) {
-            return PROCESS_ERROR_MISSING_BINARY;
+            res = PROCESS_ERROR_MISSING_BINARY;
+        } else {
+            res = PROCESS_ERROR_GENERIC;
         }
-        return PROCESS_ERROR_GENERIC;
+        goto end;
     }
 
-    free(wide);
     *handle = pi.hProcess;
-    return PROCESS_SUCCESS;
+
+    end:
+    free(wide);
+    free(cmd);
+    return res;
 }
 
 bool
diff --git a/app/src/util/process.h b/app/src/util/process.h
index 7838a848..4e365d6d 100644
--- a/app/src/util/process.h
+++ b/app/src/util/process.h
@@ -18,7 +18,6 @@
 # define NO_EXIT_CODE -1u // max value as unsigned
   typedef HANDLE process_t;
   typedef DWORD exit_code_t;
-
 #else
 
 # include <sys/types.h>
@@ -32,6 +31,8 @@
 
 #endif
 
+#define CMD_MAX 8192
+
 enum process_result {
     PROCESS_SUCCESS,
     PROCESS_ERROR_GENERIC,