diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 11:11:19 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 11:11:19 +1100 |
| commit | ebe5b2835331ab259dd32bf6dc574ae999e2d36d (patch) | |
| tree | b7ce49ef619de869dd03bfd48b65f0fa175b0f33 /source3/lib/dbwrap_ctdb.c | |
| parent | 5a10d804919af205b027ee519b9fa05519913ebe (diff) | |
| parent | f85aa66ca22f29734bdacaa559737990fbe28d8a (diff) | |
| download | samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.gz samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.tar.xz samba-ebe5b2835331ab259dd32bf6dc574ae999e2d36d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source3/lib/dbwrap_ctdb.c')
| -rw-r--r-- | source3/lib/dbwrap_ctdb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c index 03667ff355..4a5bf6d81a 100644 --- a/source3/lib/dbwrap_ctdb.c +++ b/source3/lib/dbwrap_ctdb.c @@ -121,9 +121,9 @@ static struct ctdb_marshall_buffer *db_ctdb_marshall_add(TALLOC_CTX *mem_ctx, { struct ctdb_rec_data *r; size_t m_size, r_size; - struct ctdb_marshall_buffer *m2; + struct ctdb_marshall_buffer *m2 = NULL; - r = db_ctdb_marshall_record(mem_ctx, reqid, key, header, data); + r = db_ctdb_marshall_record(talloc_tos(), reqid, key, header, data); if (r == NULL) { talloc_free(m); return NULL; @@ -133,7 +133,7 @@ static struct ctdb_marshall_buffer *db_ctdb_marshall_add(TALLOC_CTX *mem_ctx, m = (struct ctdb_marshall_buffer *)talloc_zero_size( mem_ctx, offsetof(struct ctdb_marshall_buffer, data)); if (m == NULL) { - return NULL; + goto done; } m->db_id = db_id; } @@ -145,15 +145,15 @@ static struct ctdb_marshall_buffer *db_ctdb_marshall_add(TALLOC_CTX *mem_ctx, mem_ctx, m, m_size + r_size); if (m2 == NULL) { talloc_free(m); - return NULL; + goto done; } memcpy(m_size + (uint8_t *)m2, r, r_size); - talloc_free(r); - m2->count++; +done: + talloc_free(r); return m2; } |