sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-07 17:18:11 +03:00
Code

s3:g_lock: avoid useless talloc_array(0) in g_lock_dump()

Browse Source 
In the common case we don't have any shared lock holders,
so there's no need to allocate memory for the empty array.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-08-18 17:32:43 +02:00 committed by Jeremy Allison
parent bb3dddcdf1
commit c75de32571
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/lib/g_lock.c
View File

@ -1238,12 +1238,14 @@ static void g_lock_dump_fn(TDB_DATA key, TDB_DATA data,
return;
}
shared = talloc_array(
state->mem_ctx, struct server_id, lck.num_shared);
if (shared == NULL) {
DBG_DEBUG("talloc failed\n");
state->status = NT_STATUS_NO_MEMORY;
return;
if (lck.num_shared > 0) {
shared = talloc_array(
state->mem_ctx, struct server_id, lck.num_shared);
if (shared == NULL) {
DBG_DEBUG("talloc failed\n");
state->status = NT_STATUS_NO_MEMORY;
return;
}
}
for (i=0; i<lck.num_shared; i++) {