Changeset 1164

Timestamp:

Jun 30, 2004, 2:23:52 PM (22 years ago)

Author:

harman

Message:

Added psAbort for failed memory allocation

Location:

trunk/psLib/src

Files:

• image/psImage.c (modified) (2 diffs)
• mathtypes/psImage.c (modified) (2 diffs)

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:23:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
 
     psImage *image = (psImage *)psAlloc(sizeof(psImage));
+    if(image == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     p_psMemSetDeallocator(image,(psFreeFcn)imageFree);
 
     image->data.V = psAlloc(sizeof(void*)*numRows);
+    if(image->data.V == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
 
     image->data.V[0] = psAlloc(area*elementSize);
+    if(image->data.V[0] == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
 
     for(int i = 1; i < numRows; i++) {

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 00:23:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
 
     psImage *image = (psImage *)psAlloc(sizeof(psImage));
+    if(image == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
     p_psMemSetDeallocator(image,(psFreeFcn)imageFree);
 
     image->data.V = psAlloc(sizeof(void*)*numRows);
+    if(image->data.V == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
+
 
     image->data.V[0] = psAlloc(area*elementSize);
+    if(image->data.V[0] == NULL) {
+        psAbort(__func__," : Line %d - Failed to allocate memory", __LINE__);
+    }
 
     for(int i = 1; i < numRows; i++) {