ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hans Leidekker 2017-10-04 16:49:41 +02:00 committed by Alexandre Julliard
parent e3af73716b
commit f517022ecc
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/msi/format.c
View File

@ -339,29 +339,28 @@ static WCHAR *deformat_literal( FORMAT *format, FORMSTR *str, BOOL *propfound,
return replaced; 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}; 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); if (!(ret = msi_alloc( sizeof(*ret) ))) return NULL;
ret[0] = 0;
rc = msi_alloc(1);
rc[0] = 0;
size = 1;
for (i = 1; i <= count; i++) for (i = 1; i <= count; i++)
{ {
sprintfW(buf, fmt, i, i); size += sprintfW( buf, fmt, i, i );
size += lstrlenW(buf); if (!(tmp = msi_realloc( ret, size * sizeof(*ret) )))
rc = msi_realloc(rc, size * sizeof(WCHAR)); {
lstrcatW(rc, buf); msi_free( ret );
return NULL;
}
ret = tmp;
strcatW( ret, buf );
} }
return ret;
return rc;
} }
static BOOL format_is_number(WCHAR x) static BOOL format_is_number(WCHAR x)