diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-10-29 22:26:13 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-10-29 22:26:13 +0000 |
| commit | 17e4f4ea81eda5f923f8d68fdfe5acd0a1a5e455 (patch) | |
| tree | 1144eda4f8dad1e5718d78797e93b7032f475750 /dev-libs/icu/files | |
| parent | Update sed lines to respect CFLAGS and CC. (diff) | |
| download | gentoo-2-17e4f4ea81eda5f923f8d68fdfe5acd0a1a5e455.tar.gz gentoo-2-17e4f4ea81eda5f923f8d68fdfe5acd0a1a5e455.tar.bz2 gentoo-2-17e4f4ea81eda5f923f8d68fdfe5acd0a1a5e455.zip | |
Add patched versions of both subslots for bug 486948
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'dev-libs/icu/files')
| -rw-r--r-- | dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch b/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch new file mode 100644 index 000000000000..65e734c7b3c1 --- /dev/null +++ b/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch @@ -0,0 +1,36 @@ +Index: /icu/trunk/source/i18n/csrucode.cpp
+===================================================================
+--- /icu/trunk/source/i18n/csrucode.cpp (revision 34075)
++++ /icu/trunk/source/i18n/csrucode.cpp (revision 34076)
+@@ -1,5 +1,5 @@
+ /*
+ **********************************************************************
+- * Copyright (C) 2005-2012, International Business Machines
++ * Copyright (C) 2005-2013, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ **********************************************************************
+@@ -34,6 +34,7 @@
+ const uint8_t *input = textIn->fRawInput;
+ int32_t confidence = 0;
++ int32_t length = textIn->fRawLength;
+
+- if (input[0] == 0xFE && input[1] == 0xFF) {
++ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
+ confidence = 100;
+ }
+@@ -58,6 +59,7 @@
+ const uint8_t *input = textIn->fRawInput;
+ int32_t confidence = 0;
++ int32_t length = textIn->fRawLength;
+
+- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
++ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
+ confidence = 100;
+ }
+@@ -82,5 +84,5 @@
+ int32_t confidence = 0;
+
+- if (getChar(input, 0) == 0x0000FEFFUL) {
++ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
+ hasBOM = TRUE;
+ }
|