diff -ru orig.icu/source/i18n/csrucode.cpp icu/source/i18n/csrucode.cpp
--- orig.icu/source/i18n/csrucode.cpp 2012-04-05 22:45:54.000000000 +0200
+++ icu/source/i18n/csrucode.cpp 2013-10-09 18:56:06.521791271 +0200
@@ -1,6 +1,6 @@
/*
**********************************************************************
- * Copyright (C) 2005-2006, International Business Machines
+ * Copyright (C) 2005-2013, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@@ -31,8 +31,9 @@
int32_t CharsetRecog_UTF_16_BE::match(InputText* textIn)
{
const uint8_t *input = textIn->fRawInput;
+ int32_t length = textIn->fRawLength;
- if (input[0] == 0xFE && input[1] == 0xFF) {
+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
return 100;
}
@@ -53,8 +54,9 @@
int32_t CharsetRecog_UTF_16_LE::match(InputText* textIn)
{
const uint8_t *input = textIn->fRawInput;
+ 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)) {
return 100;
}
@@ -76,7 +78,7 @@
bool hasBOM = FALSE;
int32_t confidence = 0;
- if (getChar(input, 0) == 0x0000FEFFUL) {
+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
hasBOM = TRUE;
}
Only in icu/source/i18n: csrucode.cpp.orig