Skip to content

W
wine-winehq
Commit 5f304e70 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

user32: Avoid sizeof on structs with variable length array.

parent b4712d2e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
dlls/user32/exticon.c
View file @ 5f304e70
...@@ -216,9 +216,6 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi ...@@ -216,9 +216,6 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi
* *
* Reads .ico file and build phony ICONDIR struct * Reads .ico file and build phony ICONDIR struct
*/ */
#define HEADER_SIZE (sizeof(CURSORICONDIR) - sizeof (CURSORICONDIRENTRY))
#define HEADER_SIZE_FILE (sizeof(icoICONDIR) - sizeof (icoICONDIRENTRY))
static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize )
{ {
CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ CURSORICONDIR * lpcid; /* icon resource in resource-dir format */
...@@ -233,7 +230,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG ...@@ -233,7 +230,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG
return 0; return 0;
/* allocate the phony ICONDIR structure */ /* allocate the phony ICONDIR structure */
*uSize = lpcid->idCount * sizeof(CURSORICONDIRENTRY) + HEADER_SIZE; *uSize = FIELD_OFFSET(CURSORICONDIR, idEntries[lpcid->idCount]);
if( (lpID = HeapAlloc(GetProcessHeap(),0, *uSize) )) if( (lpID = HeapAlloc(GetProcessHeap(),0, *uSize) ))
{ {
/* copy the header */ /* copy the header */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment