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

ICU-432 Fixed the CharsToUChars leak

Browse Source 
X-SVN-Rev: 3214
This commit is contained in:
George Rhoten 2000-12-13 18:16:56 +00:00
parent d7a19181a9
commit ef4ccffad3
2 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
icu4c/source/test/cintltst/cnormtst.c
View File

@ -113,16 +113,17 @@ void TestDecomp()
neededLen= u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN, UCOL_IGNORE_HANGUL, NULL, 0, &status);
if(status==U_BUFFER_OVERFLOW_ERROR)
{
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status);
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status);
}
if(U_FAILURE(status)){
log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) );
}
assertEqual(result, CharsToUChars(canonTests[x][1]), x);
assertEqual(result, canonTests[x][1], x);
free(result);
free(source);
}
ucol_close(myCollation);
}
@ -145,19 +146,21 @@ void TestCompatDecomp()
neededLen= u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT, UCOL_IGNORE_HANGUL, NULL, 0, &status);
if(status==U_BUFFER_OVERFLOW_ERROR)
{
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT,UCOL_IGNORE_HANGUL, result, resLen, &status);
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT,UCOL_IGNORE_HANGUL, result, resLen, &status);
}
if(U_FAILURE(status)){
log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) );
}
assertEqual(result, CharsToUChars(compatTests[x][1]), x);
assertEqual(result, compatTests[x][1], x);
free(result);
free(source);
}
ucol_close(myCollation);
}
void TestCanonDecompCompose()
{
UErrorCode status = U_ZERO_ERROR;
@ -176,24 +179,26 @@ void TestCanonDecompCompose()
neededLen= u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN_COMP_COMPAT, UCOL_IGNORE_HANGUL, NULL, 0, &status);
if(status==U_BUFFER_OVERFLOW_ERROR)
{
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN_COMP_COMPAT, UCOL_IGNORE_HANGUL, result, resLen, &status);
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_CAN_COMP_COMPAT, UCOL_IGNORE_HANGUL, result, resLen, &status);
}
if(U_FAILURE(status)){
log_err("ERROR in u_normalize at %s: %s\n", austrdup(source),myErrorName(status) );
}
assertEqual(result, CharsToUChars(canonTests[x][2]), x);
assertEqual(result, canonTests[x][2], x);
free(result);
free(source);
}
ucol_close(myCollation);
}
void TestCompatDecompCompose()
{
UErrorCode status = U_ZERO_ERROR;
int32_t x, neededLen, resLen;
UChar *source=NULL, *result=NULL;
UChar *source=NULL, *result=NULL;
status = U_ZERO_ERROR;
myCollation = ucol_open("en_US", &status);
if(U_FAILURE(status)){
@ -207,22 +212,23 @@ void TestCompatDecompCompose()
neededLen= u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT_COMP_CAN, UCOL_IGNORE_HANGUL, NULL, 0, &status);
if(status==U_BUFFER_OVERFLOW_ERROR)
{
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT_COMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status);
status=U_ZERO_ERROR;
resLen=neededLen+1;
result=(UChar*)malloc(sizeof(UChar*) * resLen);
u_normalize(source, u_strlen(source), UCOL_DECOMP_COMPAT_COMP_CAN, UCOL_IGNORE_HANGUL, result, resLen, &status);
}
if(U_FAILURE(status)){
log_err("ERROR in u_normalize at %s: %s\n", austrdup(source), myErrorName(status) );
}
assertEqual(result, CharsToUChars(compatTests[x][2]), x);
assertEqual(result, compatTests[x][2], x);
free(result);
free(source);
}
ucol_close(myCollation);
}
/*
static void assertEqual(const UChar* result, const UChar* expected, int32_t index)
{
if(u_strcmp(result, expected)!=0){
@ -230,6 +236,17 @@ static void assertEqual(const UChar* result, const UChar* expected, int32_t inde
austrdup(result) );
}
}
*/
static void assertEqual(const UChar* result, const char* expected, int32_t index)
{
UChar *expectedUni = CharsToUChars(expected);
if(u_strcmp(result, expectedUni)!=0){
log_err("ERROR in decomposition at index = %d. EXPECTED: %s , GOT: %s\n", index, expected,
austrdup(result) );
}
free(expectedUni);
}
static void TestNull_check(UChar *src, int32_t srcLen,
UChar *exp, int32_t expLen,

4
icu4c/source/test/cintltst/cnormtst.h
View File

@ -30,7 +30,9 @@
/*internal functions*/
static void assertEqual(const UChar* result, const UChar* expected, int32_t index);
/* static void assertEqual(const UChar* result, const UChar* expected, int32_t index);
*/
static void assertEqual(const UChar* result, const char* expected, int32_t index);