[cig-commits] r4312 - in long/3D/Gale/trunk/src/StGermain: . Base/Container/src

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:16:29 -0700 (Thu, 17 Aug 2006)
New Revision: 4312

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Container/src/BTree.c
Log:
 r2690 at earth:  boo | 2006-08-17 17:14:11 -0700
  r2644 at earth (orig r3725):  LukeHodkinson | 2006-07-27 21:47:07 -0700
  Fixed a bug in the binary tree code that caused memory
  to be leaked if duplicate nodes were disallowed. On 
  insertion, new nodes would be allocated before the code
  determined if they were duplicate or not. If they were, 
  the nodes weren't being free'd before the insertion
  routine returned.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2689
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3724
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2690
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3725

Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/src/BTree.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/src/BTree.c	2006-08-18 00:16:27 UTC (rev 4311)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/src/BTree.c	2006-08-18 00:16:29 UTC (rev 4312)
@@ -307,6 +307,9 @@
 				curr = curr->right;
 			}
 			else{
+				if( tree->dataDeleteFunction )
+					tree->dataDeleteFunction( newNode->data );
+				free( newNode );
 				return 0;
 			}
 		}