From e79e98a9f6d5a3e619d454259a6affa2428e0ea9 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 7 Apr 2005 19:39:34 +0000 Subject: r6235: Partial fix for bugid #2581. Ensure if realloc fails on an internal tdb we fail gracefully. Jeremy. (This used to be commit 28772dfca1f9e7afd01f7ea522cb2e697c318e22) --- source3/tdb/tdb.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index f153e2f258..7159550c0c 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -832,9 +832,14 @@ static int tdb_expand(TDB_CONTEXT *tdb, tdb_off size) tdb->map_size += size; - if (tdb->flags & TDB_INTERNAL) - tdb->map_ptr = realloc(tdb->map_ptr, tdb->map_size); - else { + if (tdb->flags & TDB_INTERNAL) { + char *new_map_ptr = realloc(tdb->map_ptr, tdb->map_size); + if (!new_map_ptr) { + tdb->map_size -= size; + goto fail; + } + tdb->map_ptr = new_map_ptr; + } else { /* * We must ensure the file is remapped before adding the space * to ensure consistency with systems like OpenBSD where -- cgit