Changeset 2703 for trunk/psLib/src/sysUtils

Timestamp:

Dec 13, 2004, 10:49:56 AM (22 years ago)

Author:

desonia

Message:

fixed errors caused indirectly from the psList change.

Location:

trunk/psLib/src/sysUtils

Files:

• psErrorCodes.c (modified) (3 diffs)
• psMemory.c (modified) (2 diffs)

trunk/psLib/src/sysUtils/psErrorCodes.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-10 02:50:15 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-13 20:49:56 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -79 +79 @@
         while ((desc = (psErrorDescription*)psListGetNext(iter)) != NULL) {
             if (desc->code == code) {
+                psFree(iter);
                 return desc;
             }
         }
+        psFree(iter);
     }
     return NULL;
@@ -140 +142 @@
         dynamicErrorCodes = psListAlloc(NULL);
         p_psMemSetPersistent(dynamicErrorCodes,true);
+
+        p_psMemSetPersistent(dynamicErrorCodes->iterators,true);
+        p_psMemSetPersistent(dynamicErrorCodes->iterators->data,true);
+        for (int i = 0; i < dynamicErrorCodes->iterators->n;i++) {
+            p_psMemSetPersistent(dynamicErrorCodes->iterators->data[i],true);
+        }
     }
 

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-01 00:56:32 $
+*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-13 20:49:56 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -431 +431 @@
         psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-        psError(PS_ERR_MEMORY_DEREF_USAGE,true,
-                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+        psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
                 ptr->id, ptr->file, ptr->lineno, file, lineno);
-
-        return;
-    }
+    }
+
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, file, lineno);
+        psAbort(__func__,"Memory Corruption Detected.");
+    }
+
     (void)p_psMemDecrRefCounter(vptr, file, lineno);    // this handles the free, if required.
 }