AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-6132 Verify UnicodeSet bogus state is handled without crashing

Browse Source 
X-SVN-Rev: 23393
This commit is contained in:
George Rhoten 2008-02-08 03:39:40 +00:00
parent 4ab435ccc8
commit 9ad6ca1462
3 changed files with 58 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
icu4c/source/common/uniset.cpp
View File

@ -148,7 +148,6 @@ UnicodeSet::UnicodeSet() :
UErrorCode status = U_ZERO_ERROR;
allocateStrings(status);
if (U_FAILURE(status)) {
setToBogus();
return;
}
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -176,7 +175,6 @@ UnicodeSet::UnicodeSet(UChar32 start, UChar32 end) :
UErrorCode status = U_ZERO_ERROR;
allocateStrings(status);
if (U_FAILURE(status)) {
setToBogus();
return;
}
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -204,7 +202,6 @@ UnicodeSet::UnicodeSet(const UnicodeSet& o) :
UErrorCode status = U_ZERO_ERROR;
allocateStrings(status);
if (U_FAILURE(status)) {
setToBogus();
return;
}
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -229,7 +226,6 @@ UnicodeSet::UnicodeSet(const UnicodeSet& o, UBool /* asThawed */) :
UErrorCode status = U_ZERO_ERROR;
allocateStrings(status);
if (U_FAILURE(status)) {
setToBogus();
return;
}
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -278,10 +274,13 @@ UnicodeSet& UnicodeSet::operator=(const UnicodeSet& o) {
if (isFrozen()) {
return *this;
}
if (o.isBogus()) {
setToBogus();
return *this;
}
UErrorCode ec = U_ZERO_ERROR;
ensureCapacity(o.len, ec);
if (U_FAILURE(ec)) {
setToBogus();
return *this; // There is no way to report this error :-(
}
len = o.len;
@ -878,7 +877,7 @@ UnicodeSet& UnicodeSet::add(UChar32 c) {
int32_t i = findCodePoint(pinCodePoint(c));
// already in set?
if ((i & 1) != 0 || isFrozen()) return *this;
if ((i & 1) != 0 || isFrozen() || isBogus()) return *this;
// HIGH is 0x110000
// assert(list[len-1] == HIGH);
@ -997,7 +996,7 @@ UnicodeSet& UnicodeSet::add(UChar32 c) {
* @return the modified set, for chaining
*/
UnicodeSet& UnicodeSet::add(const UnicodeString& s) {
if (s.length() == 0 || isFrozen()) return *this;
if (s.length() == 0 || isFrozen() || isBogus()) return *this;
int32_t cp = getSingleCP(s);
if (cp < 0) {
if (!strings->contains((void*) &s)) {
@ -1016,7 +1015,7 @@ UnicodeSet& UnicodeSet::add(const UnicodeString& s) {
* already be in 'strings'.
*/
void UnicodeSet::_add(const UnicodeString& s) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return;
}
UnicodeString* t = new UnicodeString(s);
@ -1196,7 +1195,7 @@ UnicodeSet& UnicodeSet::remove(UChar32 c) {
* @return the modified set, for chaining
*/
UnicodeSet& UnicodeSet::remove(const UnicodeString& s) {
if (s.length() == 0 || isFrozen()) return *this;
if (s.length() == 0 || isFrozen() || isBogus()) return *this;
int32_t cp = getSingleCP(s);
if (cp < 0) {
strings->removeElement((void*) &s);
@ -1219,7 +1218,7 @@ UnicodeSet& UnicodeSet::remove(const UnicodeString& s) {
* from this set.
*/
UnicodeSet& UnicodeSet::complement(UChar32 start, UChar32 end) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
if (pinCodePoint(start) <= pinCodePoint(end)) {
@ -1239,7 +1238,7 @@ UnicodeSet& UnicodeSet::complement(UChar32 c) {
* <code>complement(MIN_VALUE, MAX_VALUE)</code>.
*/
UnicodeSet& UnicodeSet::complement(void) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
UErrorCode status = U_ZERO_ERROR;
@ -1273,7 +1272,7 @@ UnicodeSet& UnicodeSet::complement(void) {
* @return this object, for chaining
*/
UnicodeSet& UnicodeSet::complement(const UnicodeString& s) {
if (s.length() == 0 || isFrozen()) return *this;
if (s.length() == 0 || isFrozen() || isBogus()) return *this;
int32_t cp = getSingleCP(s);
if (cp < 0) {
if (strings->contains((void*) &s)) {
@ -1321,7 +1320,7 @@ UnicodeSet& UnicodeSet::addAll(const UnicodeSet& c) {
* @param c set that defines which elements this set will retain.
*/
UnicodeSet& UnicodeSet::retainAll(const UnicodeSet& c) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
retain(c.list, c.len, 0);
@ -1339,7 +1338,7 @@ UnicodeSet& UnicodeSet::retainAll(const UnicodeSet& c) {
* this set.
*/
UnicodeSet& UnicodeSet::removeAll(const UnicodeSet& c) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
retain(c.list, c.len, 2);
@ -1356,7 +1355,7 @@ UnicodeSet& UnicodeSet::removeAll(const UnicodeSet& c) {
* this set.
*/
UnicodeSet& UnicodeSet::complementAll(const UnicodeSet& c) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
exclusiveOr(c.list, c.len, 0);
@ -1378,10 +1377,18 @@ UnicodeSet& UnicodeSet::clear(void) {
if (isFrozen()) {
return *this;
}
list[0] = UNICODESET_HIGH;
if (list != NULL) {
list[0] = UNICODESET_HIGH;
}
len = 1;
releasePattern();
strings->removeAllElements();
if (strings != NULL) {
strings->removeAllElements();
}
if (list != NULL && strings != NULL) {
// Remove bogus
fFlags = 0;
}
return *this;
}
@ -1428,7 +1435,7 @@ const UnicodeString* UnicodeSet::getString(int32_t index) const {
* possible space, without changing this object's value.
*/
UnicodeSet& UnicodeSet::compact() {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
// Delete buffer first to defragment memory less.
@ -1557,7 +1564,8 @@ void UnicodeSet::ensureCapacity(int32_t newLen, UErrorCode& ec) {
UChar32* temp = (UChar32*) uprv_realloc(list, sizeof(UChar32) * (newLen + GROW_EXTRA));
if (temp == NULL) {
ec = U_MEMORY_ALLOCATION_ERROR;
return; // TODO: We should probably set a bogus flag.
setToBogus();
return;
}
list = temp;
capacity = newLen + GROW_EXTRA;
@ -1570,7 +1578,8 @@ void UnicodeSet::ensureBufferCapacity(int32_t newLen, UErrorCode& ec) {
UChar32* temp = (UChar32*) uprv_realloc(buffer, sizeof(UChar32) * (newLen + GROW_EXTRA));
if (temp == NULL) {
ec = U_MEMORY_ALLOCATION_ERROR;
return; // TODO: We should probably set a bogus flag.
setToBogus();
return;
}
buffer = temp;
bufferCapacity = newLen + GROW_EXTRA;
@ -1608,7 +1617,7 @@ static inline UChar32 max(UChar32 a, UChar32 b) {
// polarity = 1, 2: x xor ~y == x === y
void UnicodeSet::exclusiveOr(const UChar32* other, int32_t otherLen, int8_t polarity) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return;
}
UErrorCode status = U_ZERO_ERROR;
@ -1658,7 +1667,7 @@ void UnicodeSet::exclusiveOr(const UChar32* other, int32_t otherLen, int8_t pola
// polarity = 3: ~x union ~y
void UnicodeSet::add(const UChar32* other, int32_t otherLen, int8_t polarity) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return;
}
UErrorCode status = U_ZERO_ERROR;
@ -1771,7 +1780,7 @@ void UnicodeSet::add(const UChar32* other, int32_t otherLen, int8_t polarity) {
// polarity = 3: ~x intersect ~y
void UnicodeSet::retain(const UChar32* other, int32_t otherLen, int8_t polarity) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return;
}
UErrorCode status = U_ZERO_ERROR;
@ -2060,7 +2069,7 @@ void UnicodeSet::setPattern(const UnicodeString& newPat) {
}
UnicodeFunctor *UnicodeSet::freeze() {
if(!isFrozen()) {
if(!isFrozen() && !isBogus()) {
// Do most of what compact() does before freezing because
// compact() will not work when the set is frozen.
// Small modification: Don't shrink if the savings would be tiny (<=GROW_EXTRA).

25
icu4c/source/common/uniset_props.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 1999-2007, International Business Machines
* Copyright (C) 1999-2008, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -249,7 +249,8 @@ isPOSIXClose(const UnicodeString &pattern, int32_t pos) {
UnicodeSet::UnicodeSet(const UnicodeString& pattern,
UErrorCode& status) :
len(0), capacity(START_EXTRA), list(0), bmpSet(0), buffer(0),
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL)
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL),
fFlags(0)
{
if(U_SUCCESS(status)){
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -277,7 +278,8 @@ UnicodeSet::UnicodeSet(const UnicodeString& pattern,
const SymbolTable* symbols,
UErrorCode& status) :
len(0), capacity(START_EXTRA), list(0), bmpSet(0), buffer(0),
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL)
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL),
fFlags(0)
{
if(U_SUCCESS(status)){
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -297,7 +299,8 @@ UnicodeSet::UnicodeSet(const UnicodeString& pattern, ParsePosition& pos,
const SymbolTable* symbols,
UErrorCode& status) :
len(0), capacity(START_EXTRA), list(0), bmpSet(0), buffer(0),
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL)
bufferCapacity(0), patLen(0), pat(NULL), strings(NULL), stringSpan(NULL),
fFlags(0)
{
if(U_SUCCESS(status)){
list = (UChar32*) uprv_malloc(sizeof(UChar32) * capacity);
@ -825,6 +828,10 @@ void UnicodeSet::applyPattern(RuleCharacterIterator& chars,
} else {
_generatePattern(rebuiltPat, FALSE);
}
if (isBogus() && U_SUCCESS(ec)) {
// We likely ran out of memory. AHHH!
ec = U_MEMORY_ALLOCATION_ERROR;
}
}
//----------------------------------------------------------------
@ -911,6 +918,10 @@ void UnicodeSet::applyFilter(UnicodeSet::Filter filter,
if (startHasProperty >= 0) {
add((UChar32)startHasProperty, (UChar32)0x10FFFF);
}
if (isBogus() && U_SUCCESS(status)) {
// We likely ran out of memory. AHHH!
status = U_MEMORY_ALLOCATION_ERROR;
}
}
static UBool mungeCharName(char* dst, const char* src, int32_t dstCapacity) {
@ -1101,6 +1112,10 @@ UnicodeSet::applyPropertyAlias(const UnicodeString& prop,
ec = U_ILLEGAL_ARGUMENT_ERROR;
}
if (isBogus() && U_SUCCESS(ec)) {
// We likely ran out of memory. AHHH!
ec = U_MEMORY_ALLOCATION_ERROR;
}
return *this;
}
@ -1293,7 +1308,7 @@ addCaseMapping(UnicodeSet &set, int32_t result, const UChar *full, UnicodeString
}
UnicodeSet& UnicodeSet::closeOver(int32_t attribute) {
if (isFrozen()) {
if (isFrozen() || isBogus()) {
return *this;
}
if (attribute & (USET_CASE_INSENSITIVE | USET_ADD_CASE_MAPPINGS)) {

10
icu4c/source/test/cintltst/cmsccoll.c
View File

@ -1595,13 +1595,10 @@ static void TestComposeDecompose(void) {
uint32_t len = 0;
UCollationElements *iter;
USet *charsToTest = uset_openPattern(UNICODESET_STR, -1, &status);
int32_t charsToTestSize = uset_size(charsToTest);
int32_t charsToTestSize;
noOfLoc = uloc_countAvailable();
t = malloc(charsToTestSize * sizeof(tester *));
t[0] = (tester *)malloc(sizeof(tester));
log_verbose("Testing UCA extensively for %d characters\n", charsToTestSize);
coll = ucol_open("", &status);
if(status == U_FILE_ACCESS_ERROR) {
log_data_err("Is your data around?\n");
@ -1610,7 +1607,10 @@ static void TestComposeDecompose(void) {
log_err("Error opening collator\n");
return;
}
charsToTestSize = uset_size(charsToTest);
t = malloc(charsToTestSize * sizeof(tester *));
t[0] = (tester *)malloc(sizeof(tester));
log_verbose("Testing UCA extensively for %d characters\n", charsToTestSize);
for(u = 0; u < charsToTestSize; u++) {
UChar32 ch = uset_charAt(charsToTest, u);