summaryrefslogtreecommitdiffstats
path: root/source/locking/brlock.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-07-09 08:45:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:53 -0500
commitcbbc70604e815f4ffd25d040ca0a4ef58e651523 (patch)
treea017bbfe085b017f2aea44a8dbcdd104891ef577 /source/locking/brlock.c
parent4d9f627cc8081307da3f84f784602533bd20c1e6 (diff)
downloadsamba-cbbc70604e815f4ffd25d040ca0a4ef58e651523.tar.gz
samba-cbbc70604e815f4ffd25d040ca0a4ef58e651523.tar.xz
samba-cbbc70604e815f4ffd25d040ca0a4ef58e651523.zip
r23759: Fix make test -- sorry
Diffstat (limited to 'source/locking/brlock.c')
-rw-r--r--source/locking/brlock.c4
1 files changed, 2 insertions, 2 deletions
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;