diff options
| author | Jeremy Allison <jra@samba.org> | 2002-02-27 17:49:05 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-02-27 17:49:05 +0000 |
| commit | 1e49153fba20bb2cbce1e8fe9c6e7bdab2be0d95 (patch) | |
| tree | e9a56d6d8658dae9d2960f1cb29b36dbb7d05115 | |
| parent | 97a56b542797de18e5f6afd0f8760ab9be442144 (diff) | |
| download | samba-1e49153fba20bb2cbce1e8fe9c6e7bdab2be0d95.tar.gz samba-1e49153fba20bb2cbce1e8fe9c6e7bdab2be0d95.tar.xz samba-1e49153fba20bb2cbce1e8fe9c6e7bdab2be0d95.zip | |
Memory leak on error condition fixed by Kian Win <codegrunt@rubbercookie.com>.
Jeremy.
| -rw-r--r-- | source/tdb/tdb.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/tdb/tdb.c b/source/tdb/tdb.c index 5a871e7fcc6..ad67e9393e2 100644 --- a/source/tdb/tdb.c +++ b/source/tdb/tdb.c @@ -1,6 +1,5 @@ /* - Unix SMB/Netbios implementation. - Version 3.0 + Unix SMB/CIFS implementation. Samba database functions Copyright (C) Andrew Tridgell 1999-2000 Copyright (C) Luke Kenneth Casson Leighton 2000 @@ -1379,7 +1378,7 @@ int tdb_store(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, int flag) static int tdb_already_open(dev_t device, ino_t ino) { - TDB_CONTEXT *i = NULL; + TDB_CONTEXT *i; for (i = tdbs; i; i = i->next) { if (i->device == device && i->inode == ino) { @@ -1411,7 +1410,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags, int open_flags, mode_t mode, tdb_log_func log_fn) { - TDB_CONTEXT *tdb = NULL; + TDB_CONTEXT *tdb; struct stat st; int rev = 0, locked; @@ -1453,7 +1452,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags, } if ((tdb->fd = open(name, open_flags, mode)) == -1) { - TDB_LOG((tdb, 0, "tdb_open_ex: could not open file %s: %s\n", + TDB_LOG((tdb, 5, "tdb_open_ex: could not open file %s: %s\n", name, strerror(errno))); goto fail; /* errno set by open(2) */ } @@ -1572,7 +1571,7 @@ TDB_CONTEXT *tdb_open_ex(const char *name, int hash_size, int tdb_flags, /* close a database */ int tdb_close(TDB_CONTEXT *tdb) { - TDB_CONTEXT **i = NULL; + TDB_CONTEXT **i; int ret = 0; if (tdb->map_ptr) { @@ -1729,7 +1728,7 @@ fail: /* reopen all tdb's */ int tdb_reopen_all(void) { - TDB_CONTEXT *tdb = NULL; + TDB_CONTEXT *tdb; for (tdb=tdbs; tdb; tdb = tdb->next) { if (tdb_reopen(tdb) != 0) return -1; |