diff options
Diffstat (limited to 'meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch')
-rw-r--r-- | meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch b/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch new file mode 100644 index 0000000000..ad4d61c3ea --- /dev/null +++ b/meta/recipes-support/icu/icu-51.2/add_buffer_length_check_to_UTF_16_or_32_detector.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | --- source/i18n/csrucode.cpp | ||
2 | +++ source/i18n/csrucode.cpp | ||
3 | @@ -33,8 +33,9 @@ UBool CharsetRecog_UTF_16_BE::match(Inpu | ||
4 | { | ||
5 | const uint8_t *input = textIn->fRawInput; | ||
6 | int32_t confidence = 0; | ||
7 | + int32_t length = textIn->fRawLength; | ||
8 | |||
9 | - if (input[0] == 0xFE && input[1] == 0xFF) { | ||
10 | + if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) { | ||
11 | confidence = 100; | ||
12 | } | ||
13 | |||
14 | @@ -57,8 +58,9 @@ UBool CharsetRecog_UTF_16_LE::match(Inpu | ||
15 | { | ||
16 | const uint8_t *input = textIn->fRawInput; | ||
17 | int32_t confidence = 0; | ||
18 | + int32_t length = textIn->fRawLength; | ||
19 | |||
20 | - if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { | ||
21 | + if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) { | ||
22 | confidence = 100; | ||
23 | } | ||
24 | |||
25 | @@ -81,7 +83,7 @@ UBool CharsetRecog_UTF_32::match(InputTe | ||
26 | bool hasBOM = FALSE; | ||
27 | int32_t confidence = 0; | ||
28 | |||
29 | - if (getChar(input, 0) == 0x0000FEFFUL) { | ||
30 | + if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) { | ||
31 | hasBOM = TRUE; | ||
32 | } | ||
33 | |||