Changeset 8767

Timestamp:

Sep 7, 2006, 11:24:47 AM (20 years ago)

Author:

jhoblitt

Message:

add missing include for strings.h
in parseBool();

use strncasecmp() instead of repeated calls to strncmp() where possible
fix a potental segfault by not blinding writing to *status
check that *inString is not NULL

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-09-07 21:13:58 $
+*  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-09-07 21:24:47 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include <limits.h>
 #include <inttypes.h>
+#include <strings.h>
 
 #include "psAbort.h"
@@ -258 +259 @@
                         psS32 *status)
 {
-    if ( !strncmp(inString, "T", 2) || !strncmp(inString, "t", 2) ||
-            !strncmp(inString, "1", 2) || !strncmp(inString, "TRUE", 5) ||
-            !strncmp(inString, "true", 5) || !strncmp(inString, "True", 5)) {
+    // if inString is NULL return flalse, status = 0
+    if (!inString) {
+        if (status) {
+            *status = 0;
+        }
+        return false;
+    }
+
+    if (!strncasecmp(inString, "T", 2) ||
+            !strncmp(inString, "1", 2) ||
+            !strncasecmp(inString, "true", 5)) {
+        if (status) {
+            *status = 0;
+        }
         return true;
     }
-    if ( !strncmp(inString, "F", 2) || !strncmp(inString, "f", 2) ||
-            !strncmp(inString, "0", 2) || !strncmp(inString, "FALSE", 6) ||
-            !strncmp(inString, "false", 6) || !strncmp(inString, "False", 6) ) {
+    if ( !strncasecmp(inString, "F", 2) ||
+            !strncmp(inString, "0", 2) ||
+            !strncasecmp(inString, "false", 6)) {
+        if (status) {
+            *status = 0;
+        }
         return false;
     }
 
-    *status = 1;
+    if (status) {
+        *status = 1;
+    }
     return false;
 }