organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions2

ICU-4686 rbbi data swapper, fixed size of buffer to zero out..

Browse source 
X-SVN-Rev: 18376
This commit is contained in:
Andy Heninger 2005-08-01 23:27:52 +00:00
parent cd7c10701c
commit 2f464cbba2
1 changed files with 8 additions and 10 deletions

18
icu4c/source/common/rbbidata.cpp
View file

@ -326,7 +326,8 @@ ubrk_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *outD
//
// Prefight operation? Just return the size
//
int32_t totalSize = headerSize + ds->readUInt32(rbbiDH->fLength);
int32_t breakDataLength = ds->readUInt32(rbbiDH->fLength);
int32_t totalSize = headerSize + breakDataLength;
if (length < 0) {
return totalSize;
}
@ -334,15 +335,12 @@ ubrk_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *outD
//
// Check that length passed in is consistent with length from RBBI data header.
//
if (length > 0) {
length -= headerSize;
if ((uint32_t)length < ds->readUInt32(rbbiDH->fLength)) {
udata_printError(ds, "ubrk_swap(): too few bytes (%d after ICU Data header) for break data.\n",
length);
*status=U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
if (length < totalSize) {
udata_printError(ds, "ubrk_swap(): too few bytes (%d after ICU Data header) for break data.\n",
breakDataLength);
*status=U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
}
//
@ -362,7 +360,7 @@ ubrk_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *outD
// when originally created. Any unused space between items needs to be zero.
//
if (inBytes != outBytes) {
uprv_memset(outBytes, 0, length);
uprv_memset(outBytes, 0, breakDataLength);
}
//