commit 51013ad27844de2a176287b6f3edbeccd972ee68
author Michael Stefaniuc <mstefani@redhat.de> Fri Nov 09 16:47:44 2012 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Nov 09 17:10:37 2012 +0100
tree aaa046ab69d676e89c3ea5eac748794e5c99dfc0
parent 9c431b67379839d7792aa38549cbf547bb5444c7

msi: Use FIELD_OFFSET to calculate the size of structs with variable length array.

dlls/msi/dialog.c

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 85d5859..c0ff204 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -309,7 +309,7 @@
 
     /* create a font and add it to the list */
     name = MSI_RecordGetString( rec, 1 );
-    font = msi_alloc( sizeof *font + strlenW( name )*sizeof (WCHAR) );
+    font = msi_alloc( FIELD_OFFSET( msi_font, name[strlenW( name ) + 1] ));
     strcpyW( font->name, name );
     list_add_head( &dialog->fonts, &font->entry );
 
@@ -414,7 +414,7 @@
 
     style |= WS_CHILD;
 
-    control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) );
+    control = msi_alloc( FIELD_OFFSET( msi_control, name[strlenW( name ) + 1] ));
     if (!control)
         return NULL;
 

dlls/msi/table.c

diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index c5aa685..e2186fc 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -2141,7 +2141,7 @@
     else if ( !strcmpW( name, szStorages ) )
         return STORAGES_CreateView( db, view );
 
-    sz = sizeof *tv + lstrlenW(name)*sizeof name[0] ;
+    sz = FIELD_OFFSET( MSITABLEVIEW, name[lstrlenW( name ) + 1] );
     tv = msi_alloc_zero( sz );
     if( !tv )
         return ERROR_FUNCTION_FAILED;