mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[winpr,utils] fix integer size warnings

This commit is contained in:
akallabeth 2024-09-04 11:03:20 +02:00
parent 5aff241096
commit 0eb0cff367
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
winpr/libwinpr/utils/collections/ArrayList.c
View File

@ -430,22 +430,24 @@ BOOL ArrayList_RemoveAt(wArrayList* arrayList, size_t index)
SSIZE_T ArrayList_IndexOf(wArrayList* arrayList, const void* obj, SSIZE_T startIndex, SSIZE_T count)
{
SSIZE_T sindex = 0;
SSIZE_T cindex = 0;
BOOL found = FALSE;
WINPR_ASSERT(arrayList);
ArrayList_Lock_Conditional(arrayList);
sindex = (size_t)startIndex;
SSIZE_T sindex = startIndex;
if (startIndex < 0)
sindex = 0;
cindex = (size_t)count;
if (count < 0)
cindex = arrayList->size;
SSIZE_T index = sindex;
SSIZE_T cindex = count;
if (count < 0)
{
if (arrayList->size > SSIZE_MAX)
goto fail;
cindex = (SSIZE_T)arrayList->size;
}
for (; index < sindex + cindex; index++)
{
if (arrayList->object.fnObjectEquals(arrayList->array[index], obj))
@ -455,6 +457,7 @@ SSIZE_T ArrayList_IndexOf(wArrayList* arrayList, const void* obj, SSIZE_T startI
}
}
fail:
if (!found)
index = -1;
@ -486,7 +489,7 @@ SSIZE_T ArrayList_LastIndexOf(wArrayList* arrayList, const void* obj, SSIZE_T st
WINPR_ASSERT(arrayList);
ArrayList_Lock_Conditional(arrayList);
sindex = (size_t)startIndex;
sindex = startIndex;
if (startIndex < 0)
sindex = 0;

6
winpr/libwinpr/utils/collections/BufferPool.c
View File

@ -314,13 +314,15 @@ void* BufferPool_Take(wBufferPool* pool, SSIZE_T size)
if (pool->uSize + 1 > pool->uCapacity)
{
size_t newUCapacity = pool->uCapacity * 2;
size_t newUCapacity = pool->uCapacity * 2ULL;
if (newUCapacity > SSIZE_MAX)
goto out_error;
wBufferPoolItem* newUArray =
(wBufferPoolItem*)realloc(pool->uArray, sizeof(wBufferPoolItem) * newUCapacity);
if (!newUArray)
goto out_error;
pool->uCapacity = newUCapacity;
pool->uCapacity = (SSIZE_T)newUCapacity;
pool->uArray = newUArray;
}