summaryrefslogtreecommitdiffstats
path: root/icu.10318.CVE-2013-2924_changeset_34076.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-27 11:30:46 +0100
committerRemi Collet <fedora@famillecollet.com>2013-10-27 11:30:46 +0100
commit029ee9d8d3557655c6b8de1611e97800889e470b (patch)
tree69b5d06dd2219741453f972fe2b109630c0a7a25 /icu.10318.CVE-2013-2924_changeset_34076.patch
icu-last: import from rawhide/icu
Diffstat (limited to 'icu.10318.CVE-2013-2924_changeset_34076.patch')
-rw-r--r--icu.10318.CVE-2013-2924_changeset_34076.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/icu.10318.CVE-2013-2924_changeset_34076.patch b/icu.10318.CVE-2013-2924_changeset_34076.patch
new file mode 100644
index 0000000..165d843
--- /dev/null
+++ b/icu.10318.CVE-2013-2924_changeset_34076.patch
@@ -0,0 +1,36 @@
+Index: /icu/trunk/source/i18n/csrucode.cpp
+===================================================================
+--- orig.icu/source/i18n/csrucode.cpp (revision 34075)
++++ icu/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;
+ }