X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/46f4442e9a5a4f3b98b7c1083586332f6a8a99a4..refs/heads/master:/icuSources/test/intltest/idnaref.cpp?ds=sidebyside diff --git a/icuSources/test/intltest/idnaref.cpp b/icuSources/test/intltest/idnaref.cpp index eabe1f56..afec7c9f 100644 --- a/icuSources/test/intltest/idnaref.cpp +++ b/icuSources/test/intltest/idnaref.cpp @@ -1,12 +1,14 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html /* ******************************************************************************* * - * Copyright (C) 2003-2007, International Business Machines + * Copyright (C) 2003-2011, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* * file name: idnaref.cpp - * encoding: US-ASCII + * encoding: UTF-8 * tab size: 8 (not used) * indentation:4 * @@ -196,6 +198,17 @@ CLEANUP: return b2Len; } + +static NamePrepTransform* getInstance(UErrorCode& status){ + TestIDNA *thisTest = dynamic_cast(IntlTest::gTest); + if (thisTest == nullptr && U_SUCCESS(status)) { + status = U_INTERNAL_PROGRAM_ERROR; + } + if (U_FAILURE(status)) return nullptr; + return thisTest->getInstance(status); +} + + static int32_t convertFromPuny( const UChar* src, int32_t srcLength, UChar* dest, int32_t destCapacity, UErrorCode& status){ @@ -285,31 +298,33 @@ idnaref_toASCII(const UChar* src, int32_t srcLength, } b1[b1Len++] = src[j]; } - // step 2 - NamePrepTransform* prep = TestIDNA::getInstance(*status); + NamePrepTransform* prep = getInstance(*status); if(U_FAILURE(*status)){ goto CLEANUP; } - b1Len = prep->process(src,srcLength,b1, b1Capacity,allowUnassigned,parseError,*status); + // step 2 is performed only if the source contains non ASCII + if (!srcIsASCII) { + b1Len = prep->process(src,srcLength,b1, b1Capacity,allowUnassigned,parseError,*status); - if(*status == U_BUFFER_OVERFLOW_ERROR){ - // redo processing of string - /* we do not have enough room so grow the buffer*/ - b1 = (UChar*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); - if(b1==NULL){ - *status = U_MEMORY_ALLOCATION_ERROR; - goto CLEANUP; - } + if(*status == U_BUFFER_OVERFLOW_ERROR){ + // redo processing of string + /* we do not have enough room so grow the buffer*/ + b1 = (UChar*) uprv_malloc(b1Len * U_SIZEOF_UCHAR); + if(b1==NULL){ + *status = U_MEMORY_ALLOCATION_ERROR; + goto CLEANUP; + } - *status = U_ZERO_ERROR; // reset error + *status = U_ZERO_ERROR; // reset error - b1Len = prep->process(src,srcLength,b1, b1Len,allowUnassigned, parseError, *status); - } - // error bail out - if(U_FAILURE(*status)){ - goto CLEANUP; + b1Len = prep->process(src,srcLength,b1, b1Len,allowUnassigned, parseError, *status); + } + // error bail out + if(U_FAILURE(*status)){ + goto CLEANUP; + } } if(b1Len == 0){ @@ -337,7 +352,7 @@ idnaref_toASCII(const UChar* src, int32_t srcLength, } if(srcIsASCII){ if(b1Len <= destCapacity){ - uprv_memmove(dest, b1, b1Len * U_SIZEOF_UCHAR); + u_memmove(dest, b1, b1Len); reqLength = b1Len; }else{ reqLength = b1Len; @@ -378,9 +393,9 @@ idnaref_toASCII(const UChar* src, int32_t srcLength, goto CLEANUP; } //Step 7: prepend the ACE prefix - uprv_memcpy(dest,ACE_PREFIX,ACE_PREFIX_LENGTH * U_SIZEOF_UCHAR); + u_memcpy(dest, ACE_PREFIX, ACE_PREFIX_LENGTH); //Step 6: copy the contents in b2 into dest - uprv_memcpy(dest+ACE_PREFIX_LENGTH, b2, b2Len * U_SIZEOF_UCHAR); + u_memcpy(dest+ACE_PREFIX_LENGTH, b2, b2Len); }else{ *status = U_IDNA_ACE_PREFIX_ERROR; @@ -435,7 +450,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength, reqLength=0; // UParseError parseError; - NamePrepTransform* prep = TestIDNA::getInstance(*status); + NamePrepTransform* prep = getInstance(*status); b1Len = 0; UBool* caseFlags = NULL; @@ -503,7 +518,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength, // copy everything to b1 if(srcLength < b1Capacity){ - uprv_memmove(b1,src, srcLength * U_SIZEOF_UCHAR); + u_memmove(b1, src, srcLength); }else{ /* we do not have enough room so grow the buffer*/ b1 = (UChar*) uprv_malloc(srcLength * U_SIZEOF_UCHAR); @@ -511,7 +526,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength, *status = U_MEMORY_ALLOCATION_ERROR; goto CLEANUP; } - uprv_memmove(b1,src, srcLength * U_SIZEOF_UCHAR); + u_memmove(b1, src, srcLength); } b1Len = srcLength; } @@ -573,7 +588,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength, //step 8: return output of step 5 reqLength = b2Len; if(b2Len <= destCapacity) { - uprv_memmove(dest, b2, b2Len * U_SIZEOF_UCHAR); + u_memmove(dest, b2, b2Len); } }else{ // verify that STD3 ASCII rules are satisfied @@ -599,7 +614,7 @@ idnaref_toUnicode(const UChar* src, int32_t srcLength, } //copy the source to destination if(srcLength <= destCapacity){ - uprv_memmove(dest,src,srcLength * U_SIZEOF_UCHAR); + u_memmove(dest, src, srcLength); } reqLength = srcLength; } @@ -624,9 +639,9 @@ CLEANUP: //copy the source to destination if(dest && srcLength <= destCapacity){ if(srcLength == -1) { - uprv_memmove(dest,src,u_strlen(src)* U_SIZEOF_UCHAR); + u_memmove(dest, src, u_strlen(src)); } else { - uprv_memmove(dest,src,srcLength * U_SIZEOF_UCHAR); + u_memmove(dest, src, srcLength); } } reqLength = srcLength; @@ -690,7 +705,7 @@ idnaref_IDNToASCII( const UChar* src, int32_t srcLength, int32_t reqLength = 0; // UParseError parseError; - NamePrepTransform* prep = TestIDNA::getInstance(*status); + NamePrepTransform* prep = getInstance(*status); //initialize pointers to stack buffers UChar b1Stack[MAX_LABEL_BUFFER_SIZE]; @@ -748,7 +763,7 @@ idnaref_IDNToASCII( const UChar* src, int32_t srcLength, int32_t tempLen = (reqLength + b1Len ); // copy to dest if( tempLen< destCapacity){ - uprv_memmove(dest+reqLength, b1, b1Len * U_SIZEOF_UCHAR); + u_memmove(dest+reqLength, b1, b1Len); } reqLength = tempLen; @@ -797,7 +812,7 @@ idnaref_IDNToASCII( const UChar* src, int32_t srcLength, int32_t tempLen = (reqLength + b1Len ); // copy to dest if( tempLen< destCapacity){ - uprv_memmove(dest+reqLength, b1, b1Len * U_SIZEOF_UCHAR); + u_memmove(dest+reqLength, b1, b1Len); } reqLength = tempLen; @@ -811,7 +826,7 @@ idnaref_IDNToASCII( const UChar* src, int32_t srcLength, } labelStart = delimiter; - remainingLen = srcLength - (delimiter - src); + remainingLen = static_cast(srcLength - (delimiter - src)); } } @@ -846,7 +861,7 @@ idnaref_IDNToUnicode( const UChar* src, int32_t srcLength, UBool done = FALSE; - NamePrepTransform* prep = TestIDNA::getInstance(*status); + NamePrepTransform* prep = getInstance(*status); //initialize pointers to stack buffers UChar b1Stack[MAX_LABEL_BUFFER_SIZE]; @@ -902,7 +917,7 @@ idnaref_IDNToUnicode( const UChar* src, int32_t srcLength, int32_t tempLen = (reqLength + b1Len ); // copy to dest if( tempLen< destCapacity){ - uprv_memmove(dest+reqLength, b1, b1Len * U_SIZEOF_UCHAR); + u_memmove(dest+reqLength, b1, b1Len); } reqLength = tempLen; @@ -954,7 +969,7 @@ idnaref_IDNToUnicode( const UChar* src, int32_t srcLength, int32_t tempLen = (reqLength + b1Len ); // copy to dest if( tempLen< destCapacity){ - uprv_memmove(dest+reqLength, b1, b1Len * U_SIZEOF_UCHAR); + u_memmove(dest+reqLength, b1, b1Len); } reqLength = tempLen; @@ -968,7 +983,7 @@ idnaref_IDNToUnicode( const UChar* src, int32_t srcLength, } labelStart = delimiter; - remainingLen = srcLength - (delimiter - src); + remainingLen = static_cast(srcLength - (delimiter - src)); } }