s3: Fix uninitialized variable warning (and bug).

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 902b230e6025a96fb35309f4f9d5d543144668ca..cc0295e74970e0d64b71e86a3ac74ed64cf4f9ec 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -328,8 +328,6 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
        bool ok = False;
        struct byte_range_lock *br_lck = NULL;
 
-       SMB_ASSERT(blr);
-
        if (!fsp->can_lock) {
                return fsp->is_directory ?
                        NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE;

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 1ed5e7229e61a956c67f86ec52af52eba8945be7..1ceda99fa7d41fea729f94632226729fba451355 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6950,7 +6950,7 @@ void reply_lockingX(struct smb_request *req)
                          fsp->fsp_name, (int)lock_timeout ));
 
                if (locktype & LOCKING_ANDX_CANCEL_LOCK) {
-                       struct blocking_lock_record *blr;
+                       struct blocking_lock_record *blr = NULL;
 
                        if (lp_blocking_locks(SNUM(conn))) {