sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r22754: When processing a string, ensure we don't write one past

Browse Source 
the terminating NULL if we've already processed the null
in iconv. Jerry, once I get confirmation from Thomas Bork
this needs to be in 3.0.25 final. Tests fine with valgrind
here.
Jeremy.
(This used to be commit 14b167ef6e0f2100bd9cdd05c4457e57e952fa5e)
This commit is contained in:
Jeremy Allison 2007-05-07 19:27:46 +00:00 committed by Gerald (Jerry) Carter
parent 76ce309234
commit 798af9e0c8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/lib/charcnv.c
View File

@ -972,13 +972,18 @@ size_t pull_ascii(char *dest, const void *src, size_t dest_len, size_t src_len,
ret = convert_string(CH_DOS, CH_UNIX, src, src_len, dest, dest_len, True);
if (ret == (size_t)-1) {
ret = 0;
dest_len = 0;
}
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
else
if (dest_len && ret) {
/* Did we already process the terminating zero ? */
if (dest[MIN(ret-1, dest_len-1)] != 0) {
dest[MIN(ret, dest_len-1)] = 0;
}
} else {
dest[0] = 0;
}
return src_len;
}
@ -1219,10 +1224,14 @@ size_t pull_ucs2(const void *base_ptr, char *dest, const void *src, size_t dest_
if (src_len == (size_t)-1)
src_len = ret*2;
if (dest_len)
dest[MIN(ret, dest_len-1)] = 0;
else
if (dest_len && ret) {
/* Did we already process the terminating zero ? */
if (dest[MIN(ret-1, dest_len-1)] != 0) {
dest[MIN(ret, dest_len-1)] = 0;
}
} else {
dest[0] = 0;
}
return src_len;
}