Changeset 223 for branches/samba-3.3.x/source/lib/dbwrap_rbt.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/lib/dbwrap_rbt.c (modified) (3 diffs)

branches/samba-3.3.x/source/lib/dbwrap_rbt.c

@@ -132 +132 @@
         }
 
-        node = (struct db_rbt_node *)SMB_MALLOC(
+        node = (struct db_rbt_node *)talloc_size(rec_priv->db_ctx,
                 offsetof(struct db_rbt_node, data) + rec->key.dsize
                 + data.dsize);
 
         if (node == NULL) {
-                SAFE_FREE(rec_priv->node);
+                TALLOC_FREE(rec_priv->node);
                 return NT_STATUS_NO_MEMORY;
         }
@@ -149 +149 @@
 
         memcpy(this_key.dptr, rec->key.dptr, node->keysize);
-        SAFE_FREE(rec_priv->node);
+        TALLOC_FREE(rec_priv->node);
 
         memcpy(this_val.dptr, data.dptr, node->valuesize);
@@ -195 +195 @@
 
         rb_erase(&rec_priv->node->rb_node, &rec_priv->db_ctx->tree);
-        SAFE_FREE(rec_priv->node);
+        TALLOC_FREE(rec_priv->node);
 
         return NT_STATUS_OK;