Changeset 223 for branches/samba-3.3.x/source/lib/dbwrap_ctdb.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_ctdb.c (modified) (3 diffs)

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

@@ -122 +122 @@
         struct ctdb_rec_data *r;
         size_t m_size, r_size;
-        struct ctdb_marshall_buffer *m2;
-
-        r = db_ctdb_marshall_record(mem_ctx, reqid, key, header, data);
+        struct ctdb_marshall_buffer *m2 = NULL;
+
+        r = db_ctdb_marshall_record(talloc_tos(), reqid, key, header, data);
         if (r == NULL) {
                 talloc_free(m);
@@ -134 +134 @@
                         mem_ctx, offsetof(struct ctdb_marshall_buffer, data));
                 if (m == NULL) {
-                        return NULL;
+                        goto done;
                 }
                 m->db_id = db_id;
@@ -146 +146 @@
         if (m2 == NULL) {
                 talloc_free(m);
-                return NULL;
+                goto done;
         }
 
         memcpy(m_size + (uint8_t *)m2, r, r_size);
 
+        m2->count++;
+
+done:
         talloc_free(r);
-
-        m2->count++;
-
         return m2;
 }