]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: Fix Coverity ID 2682 -- NULL_RETURNS
authorVolker Lendecke <vl@samba.org>
Thu, 19 Apr 2012 14:09:41 +0000 (16:09 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 19 Apr 2012 20:28:34 +0000 (22:28 +0200)
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Thu Apr 19 22:28:34 CEST 2012 on sn-devel-104

source3/locking/posix.c

index 463aa21fd82ecb310b5b109c81026cc894c359f3..557099b2d8062febebef993e061c12619452a1a0 100644 (file)
@@ -457,11 +457,18 @@ void reduce_windows_lock_ref_count(files_struct *fsp, unsigned int dcount)
                posix_pending_close_db, talloc_tos(),
                locking_ref_count_key_fsp(fsp, &tmp));
 
+       if (rec == NULL) {
+               DEBUG(0, ("reduce_windows_lock_ref_count: rec not found\n"));
+               return;
+       }
+
        value = dbwrap_record_get_value(rec);
 
-       SMB_ASSERT((rec != NULL)
-                  && (value.dptr != NULL)
-                  && (value.dsize == sizeof(lock_ref_count)));
+       if ((value.dptr == NULL) ||  (value.dsize != sizeof(lock_ref_count))) {
+               DEBUG(0, ("reduce_windows_lock_ref_count: wrong value\n"));
+               TALLOC_FREE(rec);
+               return;
+       }
 
        memcpy(&lock_ref_count, value.dptr, sizeof(lock_ref_count));