mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-12-01 05:43:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

[winpr,crt] fix winpr_aligned_offset_recalloc

Browse Source 
the copied data was taken from the wrong offset
This commit is contained in:
akallabeth 2023-06-12 10:03:37 +02:00 committed by akallabeth
parent a64dd36073
commit 64486828bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winpr/libwinpr/crt/alignment.c
View File

@ -206,7 +206,7 @@ void* winpr_aligned_offset_recalloc(void* memblock, size_t num, size_t size, siz
goto fail;
}
if (size == 0)
if ((num == 0) || (size == 0))
goto fail;
if (pMem->size > (1ull * num * size) + alignment)
@ -220,7 +220,7 @@ void* winpr_aligned_offset_recalloc(void* memblock, size_t num, size_t size, siz
pNewMem = WINPR_ALIGNED_MEM_STRUCT_FROM_PTR(newMemblock);
{
const size_t csize = cMIN(pMem->size, pNewMem->size);
memcpy(newMemblock, pMem->base_addr, csize);
memcpy(newMemblock, memblock, csize);
ZeroMemory(newMemblock + csize, pNewMem->size - csize);
}
fail: