Changeset 871 for trunk/dll/saveclip.c

Timestamp:

Nov 17, 2007, 2:13:23 AM (18 years ago)

Author:

Steven Levine

Message:

Correct hex edit buffer sizing to avoid data loss
Detect and report overflows in fixup()

File:

• trunk/dll/saveclip.c (modified) (6 diffs)

trunk/dll/saveclip.c

@@ -19 +19 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   27 Sep 07 SHL Correct ULONGLONG size formatting
+  16 Nov 07 SHL Ensure fixup buffer sufficiently large
 
 ***********************************************************************/
@@ -38 +39 @@
 
 static PSZ pszSrcFile = __FILE__;
+#define MAX_PATTERN_BYTES 80
 
 BOOL SaveToClip(HWND hwnd, CHAR * text, BOOL append)
@@ -216 +218 @@
         PrfQueryProfileData(fmprof,
                             appname, "SaveToListName", savename, &size);
-        size = 81;
+        size = MAX_PATTERN_BYTES + 1;
         PrfQueryProfileData(fmprof,
                             appname, "SaveToListPattern", pattern, &size);
@@ -224 +226 @@
         strcpy(pattern, "%F  %s");
       {
-        CHAR temp[162];
+        CHAR temp[MAX_PATTERN_BYTES * 4 + 1];
 
         fixup(pattern, temp, sizeof(temp), strlen(pattern));
@@ -574 +576 @@
         PrfQueryProfileData(fmprof,
                             appname, "SaveToListName", savename, &size);
-        size = 81;
+        size = MAX_PATTERN_BYTES + 1;
         PrfQueryProfileData(fmprof,
                             appname, "SaveToListPattern", pattern, &size);
@@ -582 +584 @@
         strcpy(pattern, "%F  %s");
       {
-        CHAR temp[162];
+        CHAR temp[MAX_PATTERN_BYTES * 4 + 1];
 
         fixup(pattern, temp, sizeof(temp), strlen(pattern));