aboutsummaryrefslogtreecommitdiffstats
path: root/main/icu/CVE-2015-1270.patch
blob: 57e128f7b336d6d0203773df9d0a2a5c7bc28d46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Index: /icu/trunk/source/common/ucnv_io.cpp
===================================================================
--- source/common/ucnv_io.cpp	(revision 37485)
+++ source/common/ucnv_io.cpp	(revision 37486)
@@ -2,5 +2,5 @@
 ******************************************************************************
 *
-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
@@ -745,5 +745,5 @@
              * 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 {