aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/icu4c-CVE-2015-1270.patch
blob: 2a7658d36efa144ce4e499cd57acf45169e6f1cb (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Copied from Debian.

diff --git a/source/common/ucnv_io.cpp b/source/common/ucnv_io.cpp
index 5dd35d8..4424664 100644
--- a/source/common/ucnv_io.cpp
+++ b/source/common/ucnv_io.cpp
@@ -744,7 +744,7 @@ ucnv_io_getConverterName(const char *alias, UBool *containsOption, UErrorCode *p
              * 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;
f4d318921450434dedde5fac1e68a3fb9aab248.tar.gz'>guix-8f4d318921450434dedde5fac1e68a3fb9aab248.tar.gz
guix-8f4d318921450434dedde5fac1e68a3fb9aab248.zip
gnu: linux-libre@4.14: Update to 4.14.91.
* gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.91. (%linux-libre-4.14-hash): Update hash.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm