sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

Fix the nstring calls to use the correct sizes.

Browse Source
This commit is contained in:
Jeremy Allison 2011-03-30 10:13:01 -07:00
parent c964744001
commit 048471d14b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/lib/fstring.c
View File

@ -41,11 +41,11 @@ size_t push_ascii_fstring(void *dest, const char *src)
size_t push_ascii_nstring(void *dest, const char *src)
{
ssize_t ret;
size_t converted_size;
ret = convert_string_error(CH_UNIX, CH_DOS, src, -1, dest, sizeof(nstring)-1, &converted_size);
SCVAL(dest, converted_size, 0);
return converted_size;
size_t converted_size = 0;
size_t ret;
ret = convert_string_error(CH_UNIX, CH_DOS, src, -1, dest, sizeof(nstring), &converted_size);
SCVAL(dest, sizeof(nstring)-1, 0);
return ret;
}
size_t pull_ascii_fstring(char *dest, const void *src)
@ -57,7 +57,7 @@ size_t pull_ascii_fstring(char *dest, const void *src)
size_t pull_ascii_nstring(char *dest, size_t dest_len, const void *src)
{
return pull_ascii(dest, src, dest_len, sizeof(nstring)-1, STR_TERMINATE);
return pull_ascii(dest, src, dest_len, sizeof(nstring), STR_TERMINATE);
}
/**