xmerl: Fix xmerl_ucs:is_incharset/2 crash on multi-character lists

Author: tomciopp

lib/xmerl/src/xmerl_ucs.erl

@@ -562,7 +562,7 @@ is_incharset(In,Charset) when is_list(In) ->
 	    {error,unsupported_charset};
 	{error,_} ->
 	    false;
-	[Int] when is_integer(Int) ->
+	L when is_list(L) ->
 	    true
     end.
 

lib/xmerl/test/xmerl_SUITE.erl

@@ -46,7 +46,7 @@ all() ->
     [doctests,
      {group, cpd_tests}, xpath_text1, xpath_main,
      xpath_abbreviated_syntax, xpath_functions, xpath_relational,
-     xpath_namespaces,
+     xpath_namespaces, ucs_is_incharset,
      {group, misc}, {group, eventp_tests},
      {group, ticket_tests}, {group, app_test},
      {group, appup_test}, {group, format_test}].
@@ -678,6 +678,16 @@ allow_entities_test(Config) ->
         (catch xmerl_scan:file(File, [{allow_entities, false}])),
     ok.
 
+%% Regression: xmerl_ucs:is_incharset/2 crashed with a case_clause on a
+%% multi-character list for charsets handled via to_unicode/2 (e.g. utf-8),
+%% because the clause only matched a single-element result.
+ucs_is_incharset(_Config) ->
+    true = xmerl_ucs:is_incharset("abc", 'utf-8'),
+    true = xmerl_ucs:is_incharset("a", 'utf-8'),
+    true = xmerl_ucs:is_incharset("abc", 'iso-8859-1'),
+    false = xmerl_ucs:is_incharset([256, 257], 'iso-8859-1'),
+    ok.
+
 %%======================================================================
 %% Support Functions
 %%======================================================================