git.samba.org
/
gd
/
samba
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4d9f627
)
r23759: Fix make test -- sorry
author
Volker Lendecke
<vlendec@samba.org>
Mon, 9 Jul 2007 08:45:14 +0000
(08:45 +0000)
committer
Gerald (Jerry) Carter
<jerry@samba.org>
Wed, 10 Oct 2007 17:23:53 +0000
(12:23 -0500)
source/locking/brlock.c
patch
|
blob
|
history
diff --git
a/source/locking/brlock.c
b/source/locking/brlock.c
index 9b8dcfd15e706e2ba54b42105bfb0ced1a17cca1..9b90d87ff0b41897d500e2eb64f15ea6cefe7768 100644
(file)
--- 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;