diff options
| author | Jeremy Allison <jra@samba.org> | 2003-04-14 11:04:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-04-14 11:04:57 +0000 |
| commit | ee7f29a9f8c5705e66b1ca10babb46763d413657 (patch) | |
| tree | b66fdb9d90fa6c0cf690fc4612dcdd81c72d879d /source3/lib | |
| parent | 245397cc0df08755a2fa931bac7c47b6de64d24e (diff) | |
| download | samba-ee7f29a9f8c5705e66b1ca10babb46763d413657.tar.gz samba-ee7f29a9f8c5705e66b1ca10babb46763d413657.tar.bz2 samba-ee7f29a9f8c5705e66b1ca10babb46763d413657.zip | |
Merge across tridge's Realloc fix.
Jeremy.
(This used to be commit df214d18817467fbe3023a412bceec325f73b518)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/charcnv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 00670f4a85..8b93e30267 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -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, |