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

ICU-7136 Add logic to allow %%ParentIsRoot resource to disallow the parent in the inheritance chain

Browse Source 
X-SVN-Rev: 26666
This commit is contained in:
John Emmons 2009-09-21 22:51:00 +00:00
parent 2fe427bc5d
commit 9201d2a8a6
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icu4c/source/common/uresbund.c
View File

@ -485,6 +485,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
UBool isRoot = FALSE; UBool isRoot = FALSE;
UBool hasRealData = FALSE; UBool hasRealData = FALSE;
UBool hasChopped = TRUE; UBool hasChopped = TRUE;
char name[96]; char name[96];
initCache(status); initCache(status);
@ -506,13 +507,19 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
while (hasChopped && !isRoot && t1->fParent == NULL && !t1->fData.noFallback) { while (hasChopped && !isRoot && t1->fParent == NULL && !t1->fData.noFallback) {
/* insert regular parents */ /* insert regular parents */
t2 = init_entry(name, r->fPath, &parentStatus); t2 = init_entry(name, r->fPath, &parentStatus);
/* Check for null pointer. */ /* Check for null pointer. */
if (t2 == NULL) { if (t2 == NULL) {
*status = U_MEMORY_ALLOCATION_ERROR; *status = U_MEMORY_ALLOCATION_ERROR;
goto finishUnlock; goto finishUnlock;
} }
t1->fParent = t2;
t1 = t2; Resource parentIsRoot = res_getResource(&(t1->fData),"%%ParentIsRoot");
if (parentIsRoot == RES_BOGUS) {
t1->fParent = t2;
t1 = t2;
}
hasChopped = chopLocale(name); hasChopped = chopLocale(name);
} }
} }
@ -536,8 +543,13 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, UEr
*status = U_MEMORY_ALLOCATION_ERROR; *status = U_MEMORY_ALLOCATION_ERROR;
goto finishUnlock; goto finishUnlock;
} }
t1->fParent = t2;
t1 = t2; Resource parentIsRoot = res_getResource(&(t1->fData),"%%ParentIsRoot");
if (parentIsRoot == RES_BOGUS) {
t1->fParent = t2;
t1 = t2;
}
hasChopped = chopLocale(name); hasChopped = chopLocale(name);
} }
} }