Changeset 1011 for trunk/dll/wrappers.c

Timestamp:

May 11, 2008, 5:00:39 AM (17 years ago)

Author:

Gregg Young

Message:

Fortify updates to get it working everywhere

File:

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

trunk/dll/wrappers.c

@@ -332 +332 @@
 # ifdef FORTIFY
     Fortify_free(pv, pszSrcFile, uiLineNumber);
-# else  
+# else
     free(pv);
 # endif
@@ -345 +345 @@
 # ifdef FORTIFY
   PVOID pv = Fortify_malloc(cBytes, pszSrcFile, uiLineNumber);
-# else  
+# else
   PVOID pv = malloc(cBytes);
 # endif
@@ -359 +359 @@
 PVOID xmallocz(size_t cBytes, PCSZ pszSrcFile, UINT uiLineNumber)
 {
-  PVOID pv = malloc(cBytes);
-
-  if (!pv)
-    Runtime_Error(pszSrcFile, uiLineNumber, GetPString(IDS_OUTOFMEMORY));
-  else
+  PVOID pv = xmalloc(cBytes, pszSrcFile, uiLineNumber);
+
+  if (pv)
     memset(pv, 0, cBytes);
 
@@ -374 +372 @@
 {
   if (pvIn != NullStr) {
-    PVOID pv = realloc(pvIn, cBytes);
+# ifdef FORTIFY
+  PVOID pv = Fortify_realloc(pvIn, cBytes, pszSrcFile, uiLineNumber);
+# else
+  PVOID pv = realloc(pvIn, cBytes);
+# endif
 
     if (!pv && cBytes)
@@ -391 +393 @@
 # ifdef FORTIFY
   PSZ psz = Fortify_strdup(pszIn, pszSrcFile, uiLineNumber);
-# else  
+# else
   PSZ psz = strdup(pszIn);
 # endif