diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-11-02 20:21:44 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-11-03 23:46:05 +0100 |
| commit | 8f9137cb5298a87bd989d29005a059f20dc2273f (patch) | |
| tree | 53b1593c500da90333ac8013a6d969ac250083ad | |
| parent | 39f8ff2355f7b92ed364e80b842373978254b96d (diff) | |
| download | samba-8f9137cb5298a87bd989d29005a059f20dc2273f.tar.gz samba-8f9137cb5298a87bd989d29005a059f20dc2273f.tar.xz samba-8f9137cb5298a87bd989d29005a059f20dc2273f.zip | |
share_mode_lock: don't leak lock_path onto talloc tos
Also check for allocation failures.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/locking/share_mode_lock.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 65409acf8f..6447c61740 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -58,17 +58,24 @@ static struct db_context *lock_db; static bool locking_init_internal(bool read_only) { + char *db_path; + brl_init(read_only); if (lock_db) return True; - lock_db = db_open(NULL, lock_path("locking.tdb"), + db_path = lock_path("locking.tdb"); + if (db_path == NULL) { + return false; + } + + lock_db = db_open(NULL, db_path, SMB_OPEN_DATABASE_TDB_HASH_SIZE, TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, read_only?O_RDONLY:O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE); - + TALLOC_FREE(db_path); if (!lock_db) { DEBUG(0,("ERROR: Failed to initialise locking database\n")); return False; |