From 77d800fb3ea28586a2c1385cffbf5b4314284f14 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Mon, 10 Dec 2001 05:12:52 +0000 Subject: tdb_open_ex should always "goto fail" in case of error, rather than just returning. I don't think this would leak at the moment, but it's an accident waiting to happen. (This used to be commit fe901ec194d1b8ef94386b097e72508075eb8a54) --- source3/tdb/tdb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/tdb') diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c index 955c0b322d..3b0946d580 100644 --- a/source3/tdb/tdb.c +++ b/source3/tdb/tdb.c @@ -1463,11 +1463,12 @@ TDB_CONTEXT *tdb_open_ex(char *name, int hash_size, int tdb_flags, goto fail; /* Is it already in the open list? If so, fail. */ + if (tdb_already_open(st.st_dev, st.st_ino) for (i = tdbs; i; i = i->next) { if (i->device == st.st_dev && i->inode == st.st_ino) { errno = EBUSY; close(tdb->fd); - return NULL; + goto fail; } } -- cgit