organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-10070 Fix crash due to bug in uenum_next that only affects some compilers

Browse source 
X-SVN-Rev: 33521
This commit is contained in:
Peter Edberg 2013-04-12 23:48:49 +00:00
parent 947bd7d1b6
commit eb89f787b4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/test/cintltst/uregiontest.c
View file

@ -387,12 +387,13 @@ static void TestGetContainedRegions() {
const URegion *r = uregion_getRegionFromCode(rd->code, &status);
if ( U_SUCCESS(status) ) {
UEnumeration *containedRegions;
int32_t resultLength = 0; /* bug in uenum_next if this is NULL, only affects some compilers */
const char *crID;
if (uregion_getType(r) == URGN_GROUPING) {
continue;
}
containedRegions = uregion_getContainedRegions(r, &status);
while ((crID = uenum_next(containedRegions, NULL, &status)) != NULL && U_SUCCESS(status) ) {
while ((crID = uenum_next(containedRegions, &resultLength, &status)) != NULL && U_SUCCESS(status) ) {
const URegion *cr = uregion_getRegionFromCode(crID, &status);
const URegion *containingRegion = (cr)? uregion_getContainingRegion(cr) : NULL;
if ( !containingRegion || !uregion_isEqualTo(containingRegion, r) ) {
@ -414,12 +415,13 @@ static void TestGetContainedRegionsWithType() {
const URegion *r = uregion_getRegionFromCode(rd->code, &status);
if ( U_SUCCESS(status) ) {
UEnumeration *containedRegions;
int32_t resultLength = 0; /* bug in uenum_next if this is NULL, only affects some compilers */
const char *crID;
if (uregion_getType(r) != URGN_CONTINENT) {
continue;
}
containedRegions = uregion_getContainedRegionsOfType(r, URGN_TERRITORY, &status);
while ((crID = uenum_next(containedRegions, NULL, &status)) != NULL && U_SUCCESS(status) ) {
while ((crID = uenum_next(containedRegions, &resultLength, &status)) != NULL && U_SUCCESS(status) ) {
const URegion *cr = uregion_getRegionFromCode(crID, &status);
const URegion *containingRegion = (cr)? uregion_getContainingRegionOfType(cr, URGN_CONTINENT) : NULL;
if ( !containingRegion || !uregion_isEqualTo(containingRegion, r) ) {