Lots of fixes for error paths where tdb_fetch() data need freeing.

[jra/samba/.git] / source3 / locking / posix.c

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index f7a8cd3d39c4b10e38def865c56d6bab0b8aab2b..94055de2b0750e7fdfb08e9bb3f5e8984c724d38 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -149,7 +149,7 @@ static size_t get_posix_pending_close_entries(files_struct *fsp, int **entries)
 
        dbuf = tdb_fetch(posix_pending_close_tdb, kbuf);
 
-    if (!dbuf.dptr) {
+       if (!dbuf.dptr) {
                return 0;
        }
 
@@ -176,7 +176,7 @@ static size_t get_posix_lock_entries(files_struct *fsp, struct posix_lock **entr
 
        dbuf = tdb_fetch(posix_lock_tdb, kbuf);
 
-    if (!dbuf.dptr) {
+       if (!dbuf.dptr) {
                return 0;
        }
 
@@ -338,8 +338,9 @@ static BOOL delete_posix_lock_entry_by_index(files_struct *fsp, size_t entry)
        return True;
 
  fail:
-    SAFE_FREE(dbuf.dptr);
-    return False;
+
+       SAFE_FREE(dbuf.dptr);
+       return False;
 }
 
 /****************************************************************************
@@ -385,17 +386,18 @@ static BOOL add_posix_lock_entry(files_struct *fsp, SMB_OFF_T start, SMB_OFF_T s
                goto fail;
        }
 
-    SAFE_FREE(dbuf.dptr);
+       SAFE_FREE(dbuf.dptr);
 
        DEBUG(10,("add_posix_lock: File %s: type = %s: start=%.0f size=%.0f: dev=%.0f inode=%.0f\n",
                        fsp->fsp_name, posix_lock_type_name(lock_type), (double)start, (double)size,
                        (double)fsp->dev, (double)fsp->inode ));
 
-    return True;
+       return True;
 
  fail:
-    SAFE_FREE(dbuf.dptr);
-    return False;
+
+       SAFE_FREE(dbuf.dptr);
+       return False;
 }
 
 /****************************************************************************
@@ -492,13 +494,14 @@ static int delete_posix_lock_entry(files_struct *fsp, SMB_OFF_T start, SMB_OFF_T
                        posix_lock_type_name(pl->lock_type), (double)pl->start, (double)pl->size,
                                (unsigned int)num_overlapping_records ));
 
-    SAFE_FREE(dbuf.dptr);
+       SAFE_FREE(dbuf.dptr);
 
        return num_overlapping_records;
 
  fail:
-    SAFE_FREE(dbuf.dptr);
-    return -1;
+
+       SAFE_FREE(dbuf.dptr);
+       return -1;
 }
 
 /****************************************************************************