From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 9 Jul 2007 08:45:14 +0000 (+0000)
Subject: r23759: Fix make test -- sorry
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbbc70604e815f4ffd25d040ca0a4ef58e651523;p=thirdparty%2Fsamba.git

r23759: Fix make test -- sorry
---

diff --git a/source/locking/brlock.c b/source/locking/brlock.c
index 9b8dcfd15e7..9b90d87ff0b 100644
--- a/source/locking/brlock.c
+++ b/source/locking/brlock.c
@@ -1642,8 +1642,8 @@ static struct byte_range_lock *brl_get_locks_internal(TALLOC_CTX *mem_ctx,
 	talloc_set_destructor(br_lck, byte_range_lock_destructor);
 
 	br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
-	if (!(br_lck->lock_data = SMB_MALLOC_ARRAY(
-		      struct lock_struct, br_lck->num_locks))) {
+	br_lck->lock_data = SMB_MALLOC_ARRAY(struct lock_struct, br_lck->num_locks);
+	if ((br_lck->num_locks != 0) && (br_lck->lock_data == NULL)) {
 		DEBUG(0, ("malloc failed\n"));
 		TALLOC_FREE(br_lck);
 		return NULL;