sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00
Code

Merge across tridge's Realloc fix.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent 35d1e3a5e0
commit df214d1881
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/charcnv.c
View File

@ -220,14 +220,14 @@ size_t convert_string_allocate(charset_t from, charset_t to,
outbuf = NULL;
convert:
destlen = destlen * 2;
ob = (char *)realloc(outbuf, destlen);
ob = (char *)Realloc(outbuf, destlen);
if (!ob) {
DEBUG(0, ("convert_string_allocate: realloc failed!\n"));
SAFE_FREE(outbuf);
return (size_t)-1;
}
else
} else {
outbuf = ob;
}
i_len = srclen;
o_len = destlen;
retval = smb_iconv(descriptor,