sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r984: Ensure memmove & memcpy aren't called with len == 0.

Browse Source 
Jeremy.
(This used to be commit 40c77dddc6)
This commit is contained in:
Jeremy Allison 2004-06-02 23:19:36 +00:00 committed by Gerald (Jerry) Carter
parent e707189db3
commit ac5f0785c8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/locking/locking.c
View File

@ -454,8 +454,10 @@ int get_share_modes(connection_struct *conn,
i++;
} else {
DEBUG(10,("get_share_modes: deleted %s\n", share_mode_str(i, entry_p) ));
memcpy( &shares[i], &shares[i+1],
sizeof(share_mode_entry) * (num_share_modes - i - 1));
if (num_share_modes - i - 1 > 0) {
memcpy( &shares[i], &shares[i+1],
sizeof(share_mode_entry) * (num_share_modes - i - 1));
}
num_share_modes--;
del_count++;
}
@ -575,8 +577,10 @@ ssize_t del_share_entry( SMB_DEV_T dev, SMB_INO_T inode,
if (ppse)
*ppse = memdup(&shares[i], sizeof(*shares));
data->u.num_share_mode_entries--;
memmove(&shares[i], &shares[i+1],
dbuf.dsize - (sizeof(*data) + (i+1)*sizeof(*shares)));
if ((dbuf.dsize - (sizeof(*data) + (i+1)*sizeof(*shares))) > 0) {
memmove(&shares[i], &shares[i+1],
dbuf.dsize - (sizeof(*data) + (i+1)*sizeof(*shares)));
}
del_count++;
DEBUG(10,("del_share_entry: deleting entry %d\n", i ));