ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix NetApiBufferReallocate and add a few tests for the border cases 

(thanks to Juan Lang for clarifications).
This commit is contained in:
Dimitrie O. Paun 2003-12-04 01:42:34 +00:00 committed by Alexandre Julliard
parent 793bce5cc8
commit add6726c90
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/netapi32/apibuf.c
View File

@ -60,11 +60,17 @@ NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCoun
LPVOID* NewBuffer)
{
TRACE("(%p, %ld, %p)\n", OldBuffer, NewByteCount, NewBuffer);
*NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount);
if (*NewBuffer)
return NERR_Success;
else
return GetLastError();
if (NewByteCount)
{
*NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount);
return *NewBuffer ? NERR_Success : GetLastError();
}
else
{
if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError();
*NewBuffer = 0;
return NERR_Success;
}
}
/************************************************************

9
dlls/netapi32/tests/apibuf.c
View File

@ -63,7 +63,14 @@ void run_apibuf_tests(void)
ok(dwSize >= 0, "The size");
ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer");
/* 0-length buffer */
/* border reallocate cases */
ok(pNetApiBufferReallocate(0, 1500, (LPVOID *) &p) != NERR_Success, "(Re)allocated");
ok(p == NULL, "Some memory got allocated");
ok(pNetApiBufferAllocate(1024, (LPVOID *)&p) == NERR_Success, "Memory not reserved");
ok(pNetApiBufferReallocate(p, 0, (LPVOID *) &p) == NERR_Success, "Not freed");
ok(p == NULL, "Pointer not cleared");
/* 0-length buffer */
ok(pNetApiBufferAllocate(0, (LPVOID *)&p) == NERR_Success,
"Reserved memory");
ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size");