msi: Avoid zero size allocations (Valgrind).

Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msi: Avoid zero size allocations (Valgrind).
d12728a8 · Hans Leidekker · Alexandre Julliard · 0b95ebd2 · d12728a8
Commit d12728a8 authored Mar 28, 2017 by Hans Leidekker Committed by Alexandre Julliard Mar 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

table.c dlls/msi/table.c +5 -7

No files found.
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -422,13 +422,11 @@ static UINT read_table_from_storage( MSIDATABASE *db, MSITABLE *t, IStorage *stg
        goto err;
    }

-    t->row_count = rawsize / row_size;
-    t->data = msi_alloc_zero( t->row_count * sizeof (USHORT*) );
-    if( !t->data )
-        goto err;
-    t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL));
-    if ( !t->data_persistent )
-        goto err;
+    if ((t->row_count = rawsize / row_size))
+    {
+        if (!(t->data = msi_alloc_zero( t->row_count * sizeof(USHORT *) ))) goto err;
+        if (!(t->data_persistent = msi_alloc_zero( t->row_count * sizeof(BOOL) ))) goto err;
+    }

    /* transpose all the data */
    TRACE("Transposing data from %d rows\n", t->row_count );