Changeset 9860

Timestamp:

Nov 3, 2006, 5:15:43 PM (20 years ago)

Author:

jhoblitt

Message:

check munmap()'s return status

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (2 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-11-04 00:20:09 $
+*  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-11-04 03:15:43 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1259 +1259 @@
     md = psMetadataConfigParse(md, nFail, (char *)file, overwrite);
 
-    munmap(file, (size_t)buf.st_size);
+    if (munmap(file, (size_t)buf.st_size) != 0) {
+        psError(PS_ERR_IO, true, _("failed to munmap file '%s'"), filename);
+        if (close(fd) != 0) {
+            // the new error flag is set to false so as not to hide the
+            // munmap() error
+            psError(PS_ERR_IO, false, _("Failed to close file '%s'."), filename);
+            return NULL;
+        }
+    }
+
     /*
     if (close(fd) != 0) {