Blame SOURCES/icu.10318.CVE-2013-2924_changeset_34076.patch
|
 |
8ade12 |
Index: /icu/trunk/source/i18n/csrucode.cpp
|
|
|
8ade12 |
===================================================================
|
|
|
8ade12 |
--- orig.icu/source/i18n/csrucode.cpp (revision 34075)
|
|
|
8ade12 |
+++ icu/source/i18n/csrucode.cpp (revision 34076)
|
|
|
8ade12 |
@@ -1,5 +1,5 @@
|
|
|
8ade12 |
/*
|
|
|
8ade12 |
**********************************************************************
|
|
|
8ade12 |
- * Copyright (C) 2005-2012, International Business Machines
|
|
|
8ade12 |
+ * Copyright (C) 2005-2013, International Business Machines
|
|
|
8ade12 |
* Corporation and others. All Rights Reserved.
|
|
|
8ade12 |
**********************************************************************
|
|
|
8ade12 |
@@ -34,6 +34,7 @@
|
|
|
8ade12 |
const uint8_t *input = textIn->fRawInput;
|
|
|
8ade12 |
int32_t confidence = 0;
|
|
|
8ade12 |
+ int32_t length = textIn->fRawLength;
|
|
|
8ade12 |
|
|
|
8ade12 |
- if (input[0] == 0xFE && input[1] == 0xFF) {
|
|
|
8ade12 |
+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
|
|
|
8ade12 |
confidence = 100;
|
|
|
8ade12 |
}
|
|
|
8ade12 |
@@ -58,6 +59,7 @@
|
|
|
8ade12 |
const uint8_t *input = textIn->fRawInput;
|
|
|
8ade12 |
int32_t confidence = 0;
|
|
|
8ade12 |
+ int32_t length = textIn->fRawLength;
|
|
|
8ade12 |
|
|
|
8ade12 |
- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
|
|
|
8ade12 |
+ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
|
|
|
8ade12 |
confidence = 100;
|
|
|
8ade12 |
}
|
|
|
8ade12 |
@@ -82,5 +84,5 @@
|
|
|
8ade12 |
int32_t confidence = 0;
|
|
|
8ade12 |
|
|
|
8ade12 |
- if (getChar(input, 0) == 0x0000FEFFUL) {
|
|
|
8ade12 |
+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
|
|
|
8ade12 |
hasBOM = TRUE;
|
|
|
8ade12 |
}
|