Changeset 12622 for trunk/psModules/src/concepts/pmConceptsRead.c

Timestamp:

Mar 27, 2007, 6:11:13 PM (19 years ago)

Author:

Paul Price

Message:

More checking to make sure the header exists.

File:

• trunk/psModules/src/concepts/pmConceptsRead.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -304 +304 @@
                 psFree(nameSource);
                 if (mdok && strlen(source) && strcasecmp(source, "HEADER") == 0) {
-                    headerItem = psMetadataLookup(hduLow->header, conceptItem->data.V);
-                    if (!headerItem && hduHigh != hduLow) {
+                    if (hduLow->header) {
+                        headerItem = psMetadataLookup(hduLow->header, conceptItem->data.V);
+                    }
+                    if (!headerItem && hduHigh != hduLow && hduHigh->header)) {
                         headerItem = psMetadataLookup(hduHigh->header, conceptItem->data.V);
                     }
@@ -333 +335 @@
                     psList *values = psListAlloc(NULL); // List containing the values
                     while ((key = psListGetAndIncrement(keysIter))) {
-                        psMetadataItem *value = psMetadataLookup(hduLow->header, key);
-                        if (!value && hduHigh != hduLow) {
+                        if (hduLow->header) {
+                            psMetadataItem *value = psMetadataLookup(hduLow->header, key);
+                        }
+                        if (!value && hduHigh != hduLow && hduHigh->header) {
                             value = psMetadataLookup(hduHigh->header, key);
                         }