Changeset 918 for trunk/dll/command.c

Timestamp:

Jan 12, 2008, 9:16:37 PM (18 years ago)

Author:

Gregg Young

Message:

Fix CheckApp_QuoteAddExe to return a pointer on the stack instead of a string. Use MAXCOMLINESTRG for command line length.

File:

• trunk/dll/command.c (modified) (4 diffs)

trunk/dll/command.c

@@ -44 +44 @@
 typedef struct
 {
-  CHAR cl[1001];
+  CHAR cl[MAXCOMLINESTRG];
   INT flags;
   CHAR title[34];
@@ -621 +621 @@
       {
         COMMAND temp;
-        char *psz[1002];
+        PSZ psz;
         APIRET ret;
 
+        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        *psz = CheckApp_QuoteAddExe(temp.cl);
-        memcpy(temp.cl, *psz, strlen(*psz) + 1);
+        CheckApp_QuoteAddExe(psz, temp.cl);
+        memcpy(temp.cl, psz, strlen(psz) + 1);
         if (!strchr(temp.cl, '%')){
           ret = saymsg(MB_YESNO,
@@ -715 +716 @@
       {
         COMMAND temp;
-        CHAR *psz[1002];
+        PSZ psz;
         APIRET ret;
 
+        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        *psz = CheckApp_QuoteAddExe(temp.cl);
-        memcpy(temp.cl, *psz, strlen(*psz) + 1);
+        CheckApp_QuoteAddExe(psz, temp.cl);
+        memcpy(temp.cl, psz, strlen(psz) + 1);
         if (!strchr(temp.cl, '%')){
           ret = saymsg(MB_YESNO,
@@ -814 +816 @@
     case CMD_REPLACE:
       { //Delete first
-        char *psz[1002];
+        PSZ psz;
         COMMAND temp;
         APIRET ret;
 
+        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        *psz = CheckApp_QuoteAddExe(temp.cl);
-        memcpy(temp.cl, *psz, strlen(*psz) + 1);
+        CheckApp_QuoteAddExe(psz, temp.cl);
+        memcpy(temp.cl, psz, strlen(psz) + 1);
         if (fCancelAction){
           fCancelAction = FALSE;