Changeset 889 for trunk/dll/systemf.c

Timestamp:

Dec 24, 2007, 3:17:16 AM (18 years ago)

Author:

Gregg Young

Message:

Fix crash in runemf2 quote check code when program sring in capitals

File:

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

trunk/dll/systemf.c

@@ -636 +636 @@
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
-  char szTempPgm[CCHMAXPATH], tempcom[1024], temparg[1024], buf[10] = " &|<>";
+  char szTempPgm[CCHMAXPATH], tempcom[2048], temparg[2048], buf[10] = " &|<>";
   char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
   UINT offsetquote;
@@ -685 +685 @@
            parguments);
   va_end(parguments);
-  offsetexe = strstr(pszPgm, ".exe");
-  offsetcmd = strstr(pszPgm, ".cmd");
-  offsetcom = strstr(pszPgm, ".com");
-  offsetbtm = strstr(pszPgm, ".btm");
-  offsetbat = strstr(pszPgm, ".bat");
+  offsetexe = strstr(strlwr(pszPgm), ".exe");
+  offsetcmd = strstr(strlwr(pszPgm), ".cmd");
+  offsetcom = strstr(strlwr(pszPgm), ".com");
+  offsetbtm = strstr(strlwr(pszPgm), ".btm");
+  offsetbat = strstr(strlwr(pszPgm), ".bat");
   if (offsetexe)
     offset = offsetexe;
@@ -700 +700 @@
   else if (offsetbat)
     offset = offsetbat;
-  else
-    offset = NULL;
+  else {
+    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_NOTDIRECTEXETEXT));
+    return -1;
+  }
   offsetquote = strcspn(pszPgm, buf);
   if (pszPgm[0] != '\"' && offsetquote < offset - pszPgm && offsetquote != NULL){
@@ -713 +715 @@
     BldQuotedFileName(szTempPgm, tempcom);
     strcat(szTempPgm, temparg);
-    memcpy(pszPgm, szTempPgm, 1024);
+    memcpy(pszPgm, szTempPgm, 2048);
     //printf("%s\n %s\n%s %s\n %d %d",
     //       pszPgm, szTempPgm, tempcom, temparg, offset, offsetquote); fflush(stdout);