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

ICU-1109 change NUL-termination semantics

Browse Source 
X-SVN-Rev: 6027
This commit is contained in:
Markus Scherer 2001-10-03 23:51:00 +00:00
parent 5a9e138a57
commit db16dba640
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icu4c/source/common/unistr.cpp
View File

@ -703,10 +703,11 @@ UnicodeString::doExtract(UTextOffset start,
UChar *dst,
UTextOffset dstStart) const
{
// pin indices to legal values
pinIndices(start, length);
// do not copy anything if we alias dst itself
if(fArray + start != dst + dstStart) {
// pin indices to legal values
pinIndices(start, length);
us_arrayCopy(getArrayStart(), start, dst, dstStart, length);
}
}
@ -718,8 +719,8 @@ UnicodeString::extract(UChar *dest, int32_t destCapacity,
if(isBogus() || destCapacity<0 || (destCapacity>0 && dest==0)) {
errorCode=U_ILLEGAL_ARGUMENT_ERROR;
} else {
if(fLength<=destCapacity) {
doExtract(0, fLength, dest, 0);
if(fLength>0 && fLength<=destCapacity && fArray!=dest) {
uprv_memcpy(dest, fArray, fLength*U_SIZEOF_UCHAR);
}
return u_terminateUChars(dest, destCapacity, fLength, &errorCode);
}