Skip to content

Compute Arabic shaping scratch buffer sizes in size_t #4042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ubeddulla wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −10
Open

Compute Arabic shaping scratch buffer sizes in size_t #4042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions icu4c/source/common/ushape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ handleGeneratedSpaces(char16_t *dest, int32_t sourceLength,
*pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
tempbuffer = static_cast<char16_t*>(uprv_malloc((sourceLength + 1) * U_SIZEOF_UCHAR));
tempbuffer = static_cast<char16_t*>(uprv_malloc((static_cast<size_t>(sourceLength) + 1) * U_SIZEOF_UCHAR));
/* Test for nullptr */
if(tempbuffer == nullptr) {
*pErrorCode = U_MEMORY_ALLOCATION_ERROR;
Expand All @@ -761,7 +761,7 @@ handleGeneratedSpaces(char16_t *dest, int32_t sourceLength,


if (lamAlefOption || tashkeelOption){
uprv_memset(tempbuffer, 0, (sourceLength+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(sourceLength)+1)*U_SIZEOF_UCHAR);

i = j = 0; count = 0;
while(i < sourceLength) {
Expand Down Expand Up @@ -820,7 +820,7 @@ handleGeneratedSpaces(char16_t *dest, int32_t sourceLength,
}

if(lamAlefOption || tashkeelOption){
uprv_memset(tempbuffer, 0, (sourceLength+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(sourceLength)+1)*U_SIZEOF_UCHAR);

i = j = sourceLength; count = 0;

Expand Down Expand Up @@ -861,7 +861,7 @@ handleGeneratedSpaces(char16_t *dest, int32_t sourceLength,
}

if(lamAlefOption || tashkeelOption){
uprv_memset(tempbuffer, 0, (sourceLength+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(sourceLength)+1)*U_SIZEOF_UCHAR);

i = j = 0; count = 0;
while(i < sourceLength) {
Expand Down Expand Up @@ -910,15 +910,19 @@ expandCompositCharAtBegin(char16_t *dest, int32_t sourceLength, int32_t destSize
int32_t countl = 0;
char16_t *tempbuffer=nullptr;

tempbuffer = static_cast<char16_t*>(uprv_malloc((sourceLength + 1) * U_SIZEOF_UCHAR));
if (static_cast<size_t>(sourceLength) + 1 > std::numeric_limits<size_t>::max() / U_SIZEOF_UCHAR) {
*pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
tempbuffer = static_cast<char16_t*>(uprv_malloc((static_cast<size_t>(sourceLength) + 1) * U_SIZEOF_UCHAR));

/* Test for nullptr */
if(tempbuffer == nullptr) {
*pErrorCode = U_MEMORY_ALLOCATION_ERROR;
return 0;
}

uprv_memset(tempbuffer, 0, (sourceLength+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(sourceLength)+1)*U_SIZEOF_UCHAR);

i = 0;
while(dest[i] == SPACE_CHAR) {
Expand Down Expand Up @@ -972,15 +976,19 @@ expandCompositCharAtEnd(char16_t *dest, int32_t sourceLength, int32_t destSize,U
int32_t inpsize = sourceLength;

char16_t *tempbuffer=nullptr;
tempbuffer = static_cast<char16_t*>(uprv_malloc((sourceLength + 1) * U_SIZEOF_UCHAR));
if (static_cast<size_t>(sourceLength) + 1 > std::numeric_limits<size_t>::max() / U_SIZEOF_UCHAR) {
*pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
tempbuffer = static_cast<char16_t*>(uprv_malloc((static_cast<size_t>(sourceLength) + 1) * U_SIZEOF_UCHAR));

/* Test for nullptr */
if(tempbuffer == nullptr) {
*pErrorCode = U_MEMORY_ALLOCATION_ERROR;
return 0;
}

uprv_memset(tempbuffer, 0, (sourceLength+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(sourceLength)+1)*U_SIZEOF_UCHAR);

while(inpsize>0 && dest[inpsize-1] == SPACE_CHAR) {
countr++;
Expand Down Expand Up @@ -1159,15 +1167,19 @@ expandCompositChar(char16_t *dest, int32_t sourceLength,
if (shapingMode == 1){
if ( (options&U_SHAPE_LAMALEF_MASK) == U_SHAPE_LAMALEF_RESIZE){
destSize = calculateSize(dest,sourceLength,destSize,options);
tempbuffer = static_cast<char16_t*>(uprv_malloc((destSize + 1) * U_SIZEOF_UCHAR));
if (static_cast<size_t>(destSize) + 1 > std::numeric_limits<size_t>::max() / U_SIZEOF_UCHAR) {
*pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR;
return 0;
}
tempbuffer = static_cast<char16_t*>(uprv_malloc((static_cast<size_t>(destSize) + 1) * U_SIZEOF_UCHAR));

/* Test for nullptr */
if(tempbuffer == nullptr) {
*pErrorCode = U_MEMORY_ALLOCATION_ERROR;
return 0;
}

uprv_memset(tempbuffer, 0, (destSize+1)*U_SIZEOF_UCHAR);
uprv_memset(tempbuffer, 0, (static_cast<size_t>(destSize)+1)*U_SIZEOF_UCHAR);

i = j = 0;
while(i < destSize && j < destSize) {
Expand Down