diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-01-18 15:45:22 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-01-18 15:45:22 +1100 |
| commit | 61a015a786c52008f4471e62750ad93507bce518 (patch) | |
| tree | 2942464148744495584b3495f4d325abc3a5d758 /source4/lib/tdb/common/transaction.c | |
| parent | 524d280ad09c99bcbf63d789e909afdf7edb5860 (diff) | |
| download | samba-61a015a786c52008f4471e62750ad93507bce518.tar.gz samba-61a015a786c52008f4471e62750ad93507bce518.tar.bz2 samba-61a015a786c52008f4471e62750ad93507bce518.zip | |
merged changes from v3-2-test
(This used to be commit 7077df3e2e3f171532f6a5ac87d45201736c9c11)
Diffstat (limited to 'source4/lib/tdb/common/transaction.c')
| -rw-r--r-- | source4/lib/tdb/common/transaction.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/lib/tdb/common/transaction.c b/source4/lib/tdb/common/transaction.c index ea0e3a93f3..c3e7a4e2c0 100644 --- a/source4/lib/tdb/common/transaction.c +++ b/source4/lib/tdb/common/transaction.c @@ -219,9 +219,12 @@ static int transaction_write(struct tdb_context *tdb, tdb_off_t off, uint8_t **new_blocks; /* expand the blocks array */ if (tdb->transaction->blocks == NULL) { - new_blocks = malloc((blk+1)*sizeof(uint8_t *)); + new_blocks = (uint8_t **)malloc( + (blk+1)*sizeof(uint8_t *)); } else { - new_blocks = realloc(tdb->transaction->blocks, (blk+1)*sizeof(uint8_t *)); + new_blocks = (uint8_t **)realloc( + tdb->transaction->blocks, + (blk+1)*sizeof(uint8_t *)); } if (new_blocks == NULL) { tdb->ecode = TDB_ERR_OOM; |