diff options
| author | Jeremy Allison <jra@samba.org> | 2007-04-30 01:34:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:48 -0500 |
| commit | 79de0ad9463a5cd64978beae37df79fbb4f74632 (patch) | |
| tree | feb1638b81ac49909465456163e70cf4e57dc3a9 /source3/locking | |
| parent | 1e362c0e7fff603cffa32863a5b07ecbc50f8a2d (diff) | |
| download | samba-79de0ad9463a5cd64978beae37df79fbb4f74632.tar.gz samba-79de0ad9463a5cd64978beae37df79fbb4f74632.tar.bz2 samba-79de0ad9463a5cd64978beae37df79fbb4f74632.zip | |
r22588: Make all uses of TALLOC_MEMDUP consistent.
Jeremy.
(This used to be commit 8ad13718af0ba1fcb10a6f1631b1ed3cb8d11175)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 899e211ffc..6dd3ac6ea1 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -1283,10 +1283,15 @@ void brl_close_fnum(struct byte_range_lock *br_lck) unsigned int num_locks_copy; /* Copy the current lock array. */ - locks_copy = (struct lock_struct *)TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct)); - if (!locks_copy) { - smb_panic("brl_close_fnum: talloc fail.\n"); + if (br_lck->num_locks) { + locks_copy = (struct lock_struct *)TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct)); + if (!locks_copy) { + smb_panic("brl_close_fnum: talloc fail.\n"); + } + } else { + locks_copy = NULL; } + num_locks_copy = br_lck->num_locks; for (i=0; i < num_locks_copy; i++) { |