diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-16 07:40:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:38 -0500 |
| commit | 9b8f2d8bd144700306819480bcb260d2c20969ae (patch) | |
| tree | 848486e553c0602b21741d5111d27d1319463381 | |
| parent | 4d1b33f51308c95293fa2494b47ba1255af8d216 (diff) | |
| download | samba-9b8f2d8bd144700306819480bcb260d2c20969ae.tar.gz samba-9b8f2d8bd144700306819480bcb260d2c20969ae.tar.xz samba-9b8f2d8bd144700306819480bcb260d2c20969ae.zip | |
r23882: Fix Coverity id 389 -- finally (I hope)
| -rw-r--r-- | source/locking/brlock.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 228a30b7af4..252728ced37 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -1641,14 +1641,18 @@ 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); - 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; - } - memcpy(br_lck->lock_data, data.dptr, data.dsize); + if (br_lck->num_locks != 0) { + br_lck->lock_data = SMB_MALLOC_ARRAY(struct lock_struct, + br_lck->num_locks); + if (br_lck->lock_data == NULL) { + DEBUG(0, ("malloc failed\n")); + TALLOC_FREE(br_lck); + return NULL; + } + + memcpy(br_lck->lock_data, data.dptr, data.dsize); + } if (!fsp->lockdb_clean) { int orig_num_locks = br_lck->num_locks; |