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

ICU-2194 fix bug found while running demo

Browse Source 
X-SVN-Rev: 11341
This commit is contained in:
Ram Viswanadha 2003-03-17 21:26:28 +00:00
parent 02e66e48b9
commit df758b9fb6
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
icu4c/source/common/strprep.cpp
View File

@ -292,7 +292,7 @@ int32_t StringPrep::map(const UChar* src, int32_t srcLength,
destIndex +=2;
}
}else{
syntaxError(src, srcIndex-1, srcLength,parseError);
syntaxError(src, (srcIndex>0) ? (srcIndex-1) : 0, srcLength,parseError);
status = U_IDNA_UNASSIGNED_CODEPOINT_FOUND_ERROR;
return 0;
}
@ -462,7 +462,7 @@ int32_t StringPrep::process(const UChar* src, int32_t srcLength,
if(flag == UIDNA_PROHIBITED
&& isNotProhibited(ch) == FALSE){
status = U_IDNA_PROHIBITED_CODEPOINT_FOUND_ERROR;
syntaxError(b1,b2Index-1,b2Len, parseError);
syntaxError(b1, (b2Index>0) ? (b2Index-1) : b2Index, b2Len, parseError);
goto CLEANUP;
}
@ -490,7 +490,7 @@ int32_t StringPrep::process(const UChar* src, int32_t srcLength,
//satisfy 3
if(rightToLeft == TRUE && firstCharDir != direction ){
status = U_IDNA_CHECK_BIDI_ERROR;
syntaxError(b2,b2Index-1,b2Len,parseError);
syntaxError(b2, (b2Index>0) ? (b2Index-1) : b2Index,b2Len,parseError);
return FALSE;
}

4
icu4c/source/common/uidna.cpp
View File

@ -216,11 +216,11 @@ uidna_toASCII(const UChar* src, int32_t srcLength,
/* populate the parseError struct */
if(srcIsLDH==FALSE){
syntaxError(b1,failPos-1,b1Len,parseError);
syntaxError(b1,(failPos>0) ? (failPos-1) : failPos, b1Len,parseError);
}else if(b1[0] == HYPHEN){
syntaxError(b1,0,b1Len,parseError);
}else{
syntaxError(b1,b1Len-1,b1Len,parseError);
syntaxError(b1, (b1Len>0) ? b1Len-1 : b1Len, b1Len,parseError);
}
goto CLEANUP;

30
icu4c/source/test/intltest/testidna.cpp
View File

@ -182,7 +182,23 @@ static const char *domainNames[] = {
"balexander.slip.andrew.cmu.edu",
"pool029.max2.denver.co.dynip.alter.net",
"cust49.max9.new-york.ny.ms.uu.net",
"s61.abq-dialin2.hollyberry.com"
"s61.abq-dialin2.hollyberry.com",
"www.xn--vea.com",
"www.\\u00E0\\u00B3\\u00AF.com",
"www.\\u00C2\\u00A4.com",
"www.\\u00C2\\u00A3.com",
"\\u0025",
"\\u005C\\u005C",
"@",
"\\u002F",
"www.\\u0021.com",
"www.\\u0024.com",
"\\u003f",
// These yeild U_IDNA_PROHIBITED_CODEPOINT_FOUND_ERROR
//"\\u00CF\\u0082.com",
//"\\u00CE\\u00B2\\u00C3\\u009Fss.com",
//"\\u00E2\\u0098\\u00BA.com",
"\\u00C3\\u00BC.com",
};
typedef struct ErrorCases ErrorCases;
@ -470,10 +486,10 @@ void TestIDNA::testIDNToUnicode(const char* testName, TestFunc func){
UErrorCode status = U_ZERO_ERROR;
int32_t bufLen = 0;
UParseError parseError;
for(i=0;i< (sizeof(domainNames)/sizeof(domainNames[0])); i++){
for(i=30;i< (sizeof(domainNames)/sizeof(domainNames[0])); i++){
bufLen = uprv_strlen(domainNames[i]);
u_charsToUChars(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE,UIDNA_USE_STD3_RULES|UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
bufLen = u_unescape(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
if(U_FAILURE(status)){
errln( "%s failed to convert domainNames[%i].Error: %s \n",testName, i, u_errorName(status));
break;
@ -496,10 +512,10 @@ void TestIDNA::testIDNToASCII(const char* testName, TestFunc func){
UErrorCode status = U_ZERO_ERROR;
int32_t bufLen = 0;
UParseError parseError;
for(i=0;i< (sizeof(domainNames)/sizeof(domainNames[0])); i++){
for(i=31;i< (sizeof(domainNames)/sizeof(domainNames[0])); i++){
bufLen = uprv_strlen(domainNames[i]);
u_charsToUChars(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE,UIDNA_USE_STD3_RULES|UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
bufLen = u_unescape(domainNames[i],buf, bufLen+1);
func(buf,bufLen,expected,MAX_DEST_SIZE, UIDNA_ALLOW_UNASSIGNED, &parseError,&status);
if(U_FAILURE(status)){
errln( "%s failed to convert domainNames[%i].Error: %s \n",testName,i, u_errorName(status));
break;