Changeset 1795 for trunk/dll/misc.c

Timestamp:

Sep 7, 2014, 7:35:35 PM (11 years ago)

Author:

Gregg Young

Message:

Changes to free original memory on reallocate failure. I wonder if by reallocating and then redirecting the pszFileName etc to point to the reallocated memory as opposed to directly reallocating it will have any effect on the double free issue?

File:

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

trunk/dll/misc.c

@@ -874 +874 @@
               xfree(psz, pszSrcFile, __LINE__);
             }
-            else
-              pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+            else {
+              psz = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+              if (psz)
+                pci->pszSubject = psz;
+              else {
+                free(pci->pszSubject);
+                pci->pszSubject = NullStr;
+                return FALSE; // out of memory
+              }
+            }
           }
           else {
@@ -934 +942 @@
               xfree(psz, pszSrcFile, __LINE__);
             }
-            else
-              pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+            else {
+              psz = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+              if (psz)
+                pci->pszLongName = psz;
+              else {
+                free(pci->pszLongName);
+                pci->pszLongName = NullStr;
+                return FALSE; // out of memory
+              }
+            }
           }
           else {
@@ -944 +960 @@
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
-        else {
+        else {
+          PSZ psz;
+
           WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
@@ -964 +982 @@
                                  sizeof(szData)))
             {
-              pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+              psz = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+              if (psz)
+                pci->pszFileName = psz;
+              else {
+                free(pci->pszFileName);
+                pci->pszFileName = NullStr;
+                return FALSE; // out of memory
+              }
               strcpy(szData, pci->pszFileName);
             }