system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 03:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

wbemprox: Avoid a crash when serializing object text.

Browse source
This commit is contained in:
Hans Leidekker 2012-11-02 15:34:27 +01:00 committed by Alexandre Julliard
parent 815031d832
commit 6955b09023
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/wbemprox/class.c
View file

@ -568,19 +568,23 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len )
*len = 0;
for (i = 0; i < table->num_cols; i++)
{
*len += sizeof(fmtW) / sizeof(fmtW[0]);
*len += strlenW( table->columns[i].name );
value = get_value_bstr( table, row, i );
*len += SysStringLen( value );
SysFreeString( value );
if ((value = get_value_bstr( table, row, i )))
{
*len += sizeof(fmtW) / sizeof(fmtW[0]);
*len += strlenW( table->columns[i].name );
*len += SysStringLen( value );
SysFreeString( value );
}
}
if (!(ret = SysAllocStringLen( NULL, *len ))) return NULL;
p = ret;
for (i = 0; i < table->num_cols; i++)
{
value = get_value_bstr( table, row, i );
p += sprintfW( p, fmtW, table->columns[i].name, value );
SysFreeString( value );
if ((value = get_value_bstr( table, row, i )))
{
p += sprintfW( p, fmtW, table->columns[i].name, value );
SysFreeString( value );
}
}
return ret;
}

1
dlls/wbemprox/table.c
View file

@ -166,6 +166,7 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column )
case CIM_DATETIME:
case CIM_STRING:
if (!val) return NULL;
len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2;
if (!(ret = SysAllocStringLen( NULL, len ))) return NULL;
sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val );