Hans Leidekker : msi: Fix an invalid write in build_default_format ( Valgrind).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f517022ecc8dfd23486b4cdc32343323ffd9ec9b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f517022ecc8dfd23486b4cdc32...

Author: Hans Leidekker 
Date:   Wed Oct  4 16:49:41 2017 +0200

msi: Fix an invalid write in build_default_format (Valgrind).

Signed-off-by: Hans Leidekker 
Signed-off-by: Alexandre Julliard

---

dlls/msi/format.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/msi/format.c b/dlls/msi/format.c
index 108b28d..3bcd0b8 100644
--- a/dlls/msi/format.c
+++ b/dlls/msi/format.c
@@ -339,29 +339,28 @@ static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound,
     return replaced;
 }

-static LPWSTR build_default_format(const MSIRECORD* record)
+static WCHAR *build_default_format( const MSIRECORD *record )
 {
-    int i;  
-    int count;
-    WCHAR *rc, buf[26];
     static const WCHAR fmt[] = {'%','i',':',' ','[','%','i',']',' ',0};
-    DWORD size;
+    int i, count = MSI_RecordGetFieldCount( record );
+    WCHAR *ret, *tmp, buf[26];
+    DWORD size = 1;

-    count = MSI_RecordGetFieldCount(record);
-
-    rc = msi_alloc(1);
-    rc[0] = 0;
-    size = 1;
+    if (!(ret = msi_alloc( sizeof(*ret) ))) return NULL;
+    ret[0] = 0;

for (i = 1; i <= count; i++)
     {
-        sprintfW(buf, fmt, i, i);
-        size += lstrlenW(buf);
-        rc = msi_realloc(rc, size * sizeof(WCHAR));
-        lstrcatW(rc, buf);
+        size += sprintfW( buf, fmt, i, i );
+        if (!(tmp = msi_realloc( ret, size * sizeof(*ret) )))
+        {
+            msi_free( ret );
+            return NULL;
+        }
+        ret = tmp;
+        strcatW( ret, buf );
     }
-
-    return rc;
+    return ret;
 }

static BOOL format_is_number(WCHAR x)