From ee7f29a9f8c5705e66b1ca10babb46763d413657 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 14 Apr 2003 11:04:57 +0000
Subject: Merge across tridge's Realloc fix. Jeremy. (This used to be commit
 df214d18817467fbe3023a412bceec325f73b518)

---
 source3/lib/charcnv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/lib')

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,
-- 
cgit