svn commit: samba r13773 - in branches/SAMBA_4_0/source/lib/tdb/common: .

[idra at samba.org]

Author: idra
Date: 2006-03-01 20:06:34 +0000 (Wed, 01 Mar 2006)
New Revision: 13773

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13773

Log:

Be consistent in the way you get out and free allocated data


Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/traverse.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2006-03-01 15:23:43 UTC (rev 13772)
+++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2006-03-01 20:06:34 UTC (rev 13773)
@@ -173,6 +173,7 @@
 		/* Drop chain lock, call out */
 		if (tdb_unlock(tdb, tl->hash, tl->lock_rw) != 0) {
 			ret = -1;
+			SAFE_FREE(key.dptr);
 			goto out;
 		}
 		if (fn && fn(tdb, key, dbuf, private)) {
@@ -182,9 +183,8 @@
 				TDB_LOG((tdb, 0, "tdb_traverse: unlock_record failed!\n"));;
 				ret = -1;
 			}
-			tdb->travlocks.next = tl->next;
 			SAFE_FREE(key.dptr);
-			return count;
+			goto out;
 		}
 		SAFE_FREE(key.dptr);
 	}