[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-716-g12cce3b

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  12cce3be2a24fd72106d747890caf6c7f29db43d (commit)
      from  2a0585d3093265a499c9fef60d500059f79b4112 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 12cce3be2a24fd72106d747890caf6c7f29db43d
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 18 16:03:57 2007 -0800

    Fix valgrind error in dbwrap_rbt where rec_priv->node was
    being accessed after free. VALOKER PLEASE CHECK THIS VERY
    CAREFULLY !!!! This is a correct fix in that it fixes the
    valgrind error, but it looks inelegant to me. I think if
    I understood this code better I could craft a more subtle
    fix. Still looking at it....
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/dbwrap_rbt.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_rbt.c b/source/lib/dbwrap_rbt.c
index df568a0..15d9b67 100644
--- a/source/lib/dbwrap_rbt.c
+++ b/source/lib/dbwrap_rbt.c
@@ -68,6 +68,8 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 
 	TDB_DATA this_key, this_val;
 
+	bool del_old_keyval = false;
+
 	if (rec_priv->node != NULL) {
 
 		/*
@@ -95,7 +97,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 		 */
 
 		rb_erase(&rec_priv->node->rb_node, &rec_priv->db_ctx->tree);
-		SAFE_FREE(rec_priv->node);
+		del_old_keyval = true;
 	}
 
 	node = (struct db_rbt_node *)SMB_MALLOC(
@@ -103,6 +105,9 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 		+ data.dsize);
 
 	if (node == NULL) {
+		if (del_old_keyval) {
+			SAFE_FREE(rec_priv->node);
+		}
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -152,6 +157,10 @@ static NTSTATUS db_rbt_store(struct db_record *rec, TDB_DATA data, int flag)
 	rb_link_node(&node->rb_node, parent, p);
 	rb_insert_color(&node->rb_node, &rec_priv->db_ctx->tree);
 
+	if (del_old_keyval) {
+		SAFE_FREE(rec_priv->node);
+	}
+
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository