wineoss.drv: Use offsetof to calculate the size of a struct with variable length array.

f1285514 · Michael Stefaniuc · Alexandre Julliard · 1a1577d7 · f1285514
Commit f1285514 authored Feb 13, 2013 by Michael Stefaniuc Committed by Alexandre Julliard Feb 14, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

midi.c dlls/wineoss.drv/midi.c +1 -2

No files found.
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -1115,8 +1115,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
 	    void*	extra;

            extra = HeapAlloc(GetProcessHeap(), 0,
-                              sizeof(struct sFMextra) +
-                              sizeof(struct sVoice) * (MidiOutDev[wDevID].caps.wVoices - 1));
+                              offsetof(struct sFMextra, voice[MidiOutDev[wDevID].caps.wVoices]));

 	    if (extra == 0) {
 		WARN("can't alloc extra data !\n");