diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 08:32:00 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:54 +0100 |
| commit | 01b96e47cd77c345ac27c4c882e353852e49f22b (patch) | |
| tree | 8ecaaa7fa3d542fff25ace2a4086e3ba0dbcfc89 /source4/lib/charset/charcnv.c | |
| parent | 83655ec0dd58c21cdb99d5e7c8008b4b3087449b (diff) | |
| download | samba-01b96e47cd77c345ac27c4c882e353852e49f22b.tar.gz samba-01b96e47cd77c345ac27c4c882e353852e49f22b.tar.bz2 samba-01b96e47cd77c345ac27c4c882e353852e49f22b.zip | |
r26498: Fix memory leak in iconv code.
(This used to be commit 8795697db56e4ca6715950d68f5ec370604fcc76)
Diffstat (limited to 'source4/lib/charset/charcnv.c')
| -rw-r--r-- | source4/lib/charset/charcnv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index 9a4068a4a9..54a0676599 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -134,7 +134,8 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, n1 = charset_name(ic, from); n2 = charset_name(ic, to); - ic->conv_handles[from][to] = smb_iconv_open(n2, n1, ic->native_iconv); + ic->conv_handles[from][to] = smb_iconv_open_ex(ic, n2, n1, + ic->native_iconv); if (ic->conv_handles[from][to] == (smb_iconv_t)-1) { if ((from == CH_DOS || to == CH_DOS) && @@ -146,8 +147,8 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, n1 = charset_name(ic, from); n2 = charset_name(ic, to); - ic->conv_handles[from][to] = smb_iconv_open(n2, n1, - ic->native_iconv); + ic->conv_handles[from][to] = + smb_iconv_open_ex(ic, n2, n1, ic->native_iconv); } } |