Changeset 15190 for trunk/ippTools/src/pxtree.c

Timestamp:

Oct 3, 2007, 1:25:52 PM (19 years ago)

Author:

jhoblitt

Message:

pxTreeFromMetadata - fix reference counting problem

File:

• trunk/ippTools/src/pxtree.c (modified) (4 diffs)

trunk/ippTools/src/pxtree.c

@@ -65 +65 @@
     // if the child already has a parent, release the ref count
     if (child->parent) {
-        psMemDecrRefCounter(child->parent);
+        psFree(child->parent);
     }
     // [re]parent the child
@@ -167 +167 @@
             // add it to the hash of nodes
             psHashAdd(nodeNames, item->name, node);
+            // node may be used below because it will still have a ref count of
+            // 1 from being on the hash, this is equivalent to the "view" we
+            // get from a hashlookup
+            psFree(node);
         }
 
@@ -178 +182 @@
                 // add it to the hash of nodes
                 psHashAdd(nodeNames, item->data.str, child);
+                // child may be used below because it will still have a ref
+                // count of 1 from being on the hash, this is equivalent to the
+                // "view" we get from a hashlookup
+                psFree(child);
             }
             pxNodeAddChild(node, child);
         }
-
-        psFree(node);
     }
     psFree(iter);
@@ -189 +195 @@
     psFree(nodeNames);
 
-    return root;
+    return psMemIncrRefCounter(root);
 }