r9628 jmb - /trunk/libparserutils/src/input/filter.c

[netsurf at semichrome.net]

Author: jmb
Date: Mon Oct 12 11:56:30 2009
New Revision: 9628

URL: http://source.netsurf-browser.org?rev=9628&view=rev
Log:
Ensure we use the canonical charset name when invoking iconv_open()

Modified:
    trunk/libparserutils/src/input/filter.c

Modified: trunk/libparserutils/src/input/filter.c
URL: http://source.netsurf-browser.org/trunk/libparserutils/src/input/filter.c?rev=9628&r1=9627&r2=9628&view=diff
==============================================================================
--- trunk/libparserutils/src/input/filter.c (original)
+++ trunk/libparserutils/src/input/filter.c Mon Oct 12 11:56:30 2009
@@ -393,7 +393,8 @@
 	}
 
 	input->cd = iconv_open(
-		parserutils_charset_mibenum_to_name(input->int_enc), enc);
+		parserutils_charset_mibenum_to_name(input->int_enc),
+		parserutils_charset_mibenum_to_name(mibenum));
 	if (input->cd == (iconv_t) -1) {
 		return (errno == EINVAL) ? PARSERUTILS_BADENCODING
 					 : PARSERUTILS_NOMEM;