Changeset 18701

Timestamp:

Jul 23, 2008, 5:42:38 PM (18 years ago)

Author:

Paul Price

Message:

Attempts to fix case where there's a single skycell in the tree: then
the child->data is NULL. Not sure I'm returning the right value from
findReadyNodes().
Fixing memory problem caused by freeing hash before done with the contents.

File:

• trunk/ippTools/src/magictool.c (modified) (3 diffs)

trunk/ippTools/src/magictool.c

@@ -699 +699 @@
     }
 
+    if (!node->data) {
+        // It's a leaf node, not done
+        return false;
+    }
+
     if (psMetadataLookupBool(NULL, node->data, "done")) {
         // It's already done
@@ -712 +717 @@
         while ((child = psListGetAndIncrement(iter))) {
             psMetadata *data = child->data;
+            if (!data) {
+                // Child is a leaf node, not done
+                psFree(iter);
+                psFree(work);
+                return false;
+            }
 
             bool status = false;
@@ -853 +864 @@
 
     // find the root of the tree
-    pxNode *root = psHashLookup(forest, "root");
+    pxNode *root = psMemIncrRefCounter(psHashLookup(forest, "root"));
     psFree(forest);
-    // pxTreePrint(stdout, root);
+    //    pxTreePrint(stdout, root);
 
     // crawl through the tree and looking for nodes with children that are all