Description: fix denial of service via mishandling of converter names
 with initial x- substrings
Origin: upstream, http://bugs.icu-project.org/trac/changeset/37486

Index: icu-55.1/source/common/ucnv_io.cpp
===================================================================
--- icu-55.1.orig/source/common/ucnv_io.cpp	2015-03-27 17:10:42.000000000 -0400
+++ icu-55.1/source/common/ucnv_io.cpp	2015-09-11 08:19:13.757638112 -0400
@@ -744,7 +744,7 @@
              * the name begins with 'x-'. If it does, strip it off and try
              * again.  This behaviour is similar to how ICU4J does it.
              */
-            if (aliasTmp[0] == 'x' || aliasTmp[1] == '-') {
+            if (aliasTmp[0] == 'x' && aliasTmp[1] == '-') {
                 aliasTmp = aliasTmp+2;
             } else {
                 break;