diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-12 07:37:23 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-12 07:39:43 +0000 |
commit | 4979be8d1a8b85e58bc4836a5844392625025576 (patch) | |
tree | a1d1ec2e2298f0f86b3549582f405b571e5be6c3 /main/icu/CVE-2015-1270.patch | |
parent | cc537cdb1d7fbece6d0a700831e2e0107e2d7047 (diff) | |
download | aports-4979be8d1a8b85e58bc4836a5844392625025576.tar.bz2 aports-4979be8d1a8b85e58bc4836a5844392625025576.tar.xz |
main/icu: security fix for CVE-2015-1270
Diffstat (limited to 'main/icu/CVE-2015-1270.patch')
-rw-r--r-- | main/icu/CVE-2015-1270.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/main/icu/CVE-2015-1270.patch b/main/icu/CVE-2015-1270.patch new file mode 100644 index 0000000000..57e128f7b3 --- /dev/null +++ b/main/icu/CVE-2015-1270.patch @@ -0,0 +1,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 {
|