Changeset 931 for trunk/dll

Timestamp:

Jan 19, 2008, 8:15:26 PM (18 years ago)

Author:

Gregg Young

Message:

Fixed Trap caused by mismatch buffer sizes

File:

• trunk/dll/avv.c (modified) (1 diff)

trunk/dll/avv.c

@@ -93 +93 @@
 static PSZ free_and_strdup_quoted_from_window(HWND hwnd, USHORT id, PSZ pszDest)
 { // fixme for command line limit
-  CHAR szCmdLine[256];
-  PSZ pszWorkBuf;
-
-  pszWorkBuf = xmalloc(256, pszSrcFile, __LINE__);
+  CHAR szCmdLine[MAXCOMLINESTRG];
+
   xfree(pszDest);
   WinQueryDlgItemText(hwnd, id, sizeof(szCmdLine), szCmdLine);
   if (*szCmdLine){
+    PSZ pszWorkBuf;
+    pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
     NormalizeCmdLine(pszWorkBuf, szCmdLine);
-    pszDest = xstrdup(pszWorkBuf, pszSrcFile, __LINE__);
+    pszDest = xstrdup(szCmdLine, pszSrcFile, __LINE__);
+    xfree(pszWorkBuf);
   }
   else
     pszDest = NULL;
-  xfree(pszWorkBuf);
   return pszDest;
 }