1 |
dilfridge 13/10/29 22:26:13 |
2 |
|
3 |
Added: icu-51.1-CVE-2013-2924.patch |
4 |
Log: |
5 |
Add patched versions of both subslots for bug 486948 |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: icu-51.1-CVE-2013-2924.patch |
16 |
=================================================================== |
17 |
Index: /icu/trunk/source/i18n/csrucode.cpp |
18 |
=================================================================== |
19 |
--- /icu/trunk/source/i18n/csrucode.cpp (revision 34075) |
20 |
+++ /icu/trunk/source/i18n/csrucode.cpp (revision 34076) |
21 |
@@ -1,5 +1,5 @@ |
22 |
/* |
23 |
********************************************************************** |
24 |
- * Copyright (C) 2005-2012, International Business Machines |
25 |
+ * Copyright (C) 2005-2013, International Business Machines |
26 |
* Corporation and others. All Rights Reserved. |
27 |
********************************************************************** |
28 |
@@ -34,6 +34,7 @@ |
29 |
const uint8_t *input = textIn->fRawInput; |
30 |
int32_t confidence = 0; |
31 |
+ int32_t length = textIn->fRawLength; |
32 |
|
33 |
- if (input[0] == 0xFE && input[1] == 0xFF) { |
34 |
+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) { |
35 |
confidence = 100; |
36 |
} |
37 |
@@ -58,6 +59,7 @@ |
38 |
const uint8_t *input = textIn->fRawInput; |
39 |
int32_t confidence = 0; |
40 |
+ int32_t length = textIn->fRawLength; |
41 |
|
42 |
- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { |
43 |
+ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { |
44 |
confidence = 100; |
45 |
} |
46 |
@@ -82,5 +84,5 @@ |
47 |
int32_t confidence = 0; |
48 |
|
49 |
- if (getChar(input, 0) == 0x0000FEFFUL) { |
50 |
+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) { |
51 |
hasBOM = TRUE; |
52 |
} |