Changeset 5864 for branches/eam_rel9_p0/psModules/src/config/pmConfig.c

Timestamp:

Dec 30, 2005, 6:34:18 PM (21 years ago)

Author:

magnier

Message:

pmConfigRead crashed if site,camera,recipe were NULL
pmConfigValidateCamera kept attempting test after failed rule,
causing a crash

File:

• branches/eam_rel9_p0/psModules/src/config/pmConfig.c (modified) (10 diffs)

branches/eam_rel9_p0/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-12-12 20:11:06 $
+ *  @version $Revision: 1.5.4.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-31 04:34:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
 {
     PS_ASSERT_PTR_NON_NULL(site, false);
-    PS_ASSERT_PTR_NON_NULL(*site, false);
+    // PS_ASSERT_PTR_NON_NULL(*site, false);
     PS_ASSERT_PTR_NON_NULL(camera, false);
-    PS_ASSERT_PTR_NON_NULL(*camera, false);
+    // PS_ASSERT_PTR_NON_NULL(*camera, false);
     PS_ASSERT_PTR_NON_NULL(recipe, false);
-    PS_ASSERT_PTR_NON_NULL(*recipe, false);
+    // PS_ASSERT_PTR_NON_NULL(*recipe, false);
     PS_ASSERT_INT_POSITIVE(*argc, false);
     PS_ASSERT_PTR_NON_NULL(argv, false);
@@ -264 +264 @@
 }
 
+
+// XXX EAM : was trying headerItem when it was NULL
+// XXX EAM : should just free & return on first failure
 bool pmConfigValidateCamera(
     const psMetadata *camera,
@@ -284 +287 @@
         psMetadataItem *headerItem = psMetadataLookup((psMetadata*)header, ruleItem->name);
         if (! headerItem || headerItem->type != ruleItem->type) {
-            match = false;
+            psFree(ruleIter);
+            return false;
         }
 
@@ -294 +298 @@
             if (strncmp(ruleItem->data.V, headerItem->data.V,
                         strlen(ruleItem->data.V)) != 0) {
-                match = false;
+                psFree(ruleIter);
+                return false;
             }
             break;
@@ -302 +307 @@
                     ruleItem->data.S32, headerItem->data.S32);
             if (ruleItem->data.S32 != headerItem->data.S32) {
-                match = false;
+                psFree(ruleIter);
+                return false;
             }
             break;
@@ -309 +315 @@
                     ruleItem->data.F32, headerItem->data.F32);
             if (ruleItem->data.F32 != headerItem->data.F32) {
-                match = false;
+                psFree(ruleIter);
+                return false;
             }
             break;
@@ -316 +323 @@
                     ruleItem->data.F64, headerItem->data.F64);
             if (ruleItem->data.F64 != headerItem->data.F64) {
-                match = false;
+                psFree(ruleIter);
+                return false;
             }
             break;
@@ -326 +334 @@
 
     psFree(ruleIter);
-
     return match;
 }
@@ -420 +427 @@
 pmConfigDB(*site)
  
+XXX: this should allow the option of having NO database server, if chosen by config
 XXX: What should we use for the Database namespace in the call to psDBInit()?
 This is currently NULL.