Changeset 963 for trunk/dll/wrappers.c

Timestamp:

Feb 18, 2008, 7:33:29 PM (18 years ago)

Author:

Gregg Young

Message:

Check if pointer passed to xrealloc & xfree point to NullStr (ticket 212).

File:

• trunk/dll/wrappers.c (modified) (2 diffs)

trunk/dll/wrappers.c

@@ -323 +323 @@
 VOID xfree(PVOID pv)
 {
-  if (pv)
+  if (pv && pv != NullStr)
     free(pv);
 }
@@ -357 +357 @@
 PVOID xrealloc(PVOID pvIn, size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber)
 {
-  PVOID pv = realloc(pvIn, cBytes);
-
-  if (!pv && cBytes)
-    Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
-
-  return pv;
-
+  if (pvIn != NullStr) {
+    PVOID pv = realloc(pvIn, cBytes);
+
+    if (!pv && cBytes)
+      Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
+
+    return pv;
+  }
+  else
+    return xmalloc(cBytes, pszSrcFile, uiLineNumber);
 }