sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

r25277: Belt-and-braces approach to Volker's fix for RPC-SAMBA3-GETUSERNAME.

Browse Source 
If we promise dest is null terminated, ensure we do it even on
fast path exits.
Jeremy.
This commit is contained in:
Jeremy Allison 2007-09-21 10:32:57 +00:00 committed by Gerald (Jerry) Carter
parent 9a9c164366
commit 32626e2b97
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/lib/charcnv.c
View File

@ -1403,15 +1403,18 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
{
size_t ret;
if (!src_len) {
return 0;
}
if (dest_len == (size_t)-1) {
/* No longer allow dest_len of -1. */
smb_panic("pull_ucs2 - invalid dest_len of -1");
}
if (!src_len) {
if (dest && dest_len > 0) {
dest[0] = '\0';
}
return 0;
}
if (ucs2_align(base_ptr, src, flags)) {
src = (const void *)((const char *)src + 1);
if (src_len != (size_t)-1)