Michael Stefaniuc : netapi32: Avoid sizeof on structs with a varlength array.
Alexandre Julliard
julliard at winehq.org
Tue Dec 11 14:41:15 CST 2012
Module: wine
Branch: master
Commit: 54b75f3de3b3ab7b1cd3807b18bb9bb5f2f8cc8d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b75f3de3b3ab7b1cd3807b18bb9bb5f2f8cc8d
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Dec 11 13:37:41 2012 +0100
netapi32: Avoid sizeof on structs with a varlength array.
---
dlls/netapi32/nbt.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
index 3cd8a61..1bbcaf0 100644
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -407,9 +407,8 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount,
{
if (queryData->cacheEntry == NULL)
{
- queryData->cacheEntry = HeapAlloc(
- GetProcessHeap(), 0, sizeof(NBNameCacheEntry) +
- (answerCount - 1) * sizeof(DWORD));
+ queryData->cacheEntry = HeapAlloc(GetProcessHeap(), 0,
+ FIELD_OFFSET(NBNameCacheEntry, addresses[answerCount]));
if (queryData->cacheEntry)
queryData->cacheEntry->numAddresses = 0;
else
@@ -541,8 +540,8 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ],
if (addr != INADDR_NONE)
{
- *cacheEntry = HeapAlloc(GetProcessHeap(),
- 0, sizeof(NBNameCacheEntry));
+ *cacheEntry = HeapAlloc(GetProcessHeap(), 0,
+ FIELD_OFFSET(NBNameCacheEntry, addresses[1]));
if (*cacheEntry)
{
memcpy((*cacheEntry)->name, name, NCBNAMSZ);
@@ -566,9 +565,8 @@ static UCHAR NetBTinetResolve(const UCHAR name[NCBNAMSZ],
;
if (host->h_addr_list && host->h_addr_list[0])
{
- *cacheEntry = HeapAlloc(
- GetProcessHeap(), 0, sizeof(NBNameCacheEntry) +
- (i - 1) * sizeof(DWORD));
+ *cacheEntry = HeapAlloc(GetProcessHeap(), 0,
+ FIELD_OFFSET(NBNameCacheEntry, addresses[i]));
if (*cacheEntry)
{
memcpy((*cacheEntry)->name, name, NCBNAMSZ);
More information about the wine-cvs
mailing list