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

wmic: Handle VariantChangeType() failures.

Browse source 
wmic currently crashes on, e. g., VT_EMPTY or VT_ARRAY types returned.
This commit is contained in:
Paul Gofman 2022-11-23 12:15:35 -06:00 committed by Alexandre Julliard
parent 85b84a949c
commit 97b9d8ddbe
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
programs/wmic/main.c
View file

@ -165,6 +165,19 @@ static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *propli
return hr;
}
static void convert_to_bstr( VARIANT *v )
{
VARTYPE vt;
if (SUCCEEDED(VariantChangeType( v, v, 0, VT_BSTR ))) return;
vt = V_VT(v);
VariantClear( v );
V_VT(v) = VT_BSTR;
V_BSTR(v) = SysAllocString( L"" );
if (vt != VT_NULL && vt != VT_EMPTY)
WINE_FIXME( "Could not convert variant, vt %u.\n", vt );
}
static int query_prop( const WCHAR *class, const WCHAR *propnames )
{
HRESULT hr;
@ -227,7 +240,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames )
IWbemClassObject_BeginEnumeration( obj, 0 );
while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK)
{
VariantChangeType( &v, &v, 0, VT_BSTR );
convert_to_bstr( &v );
width = max( lstrlenW( V_BSTR( &v ) ), width );
VariantClear( &v );
SysFreeString( name );
@ -261,7 +274,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propnames )
IWbemClassObject_BeginEnumeration( obj, 0 );
while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK)
{
VariantChangeType( &v, &v, 0, VT_BSTR );
convert_to_bstr( &v );
output_text( V_BSTR( &v ), width );
VariantClear( &v );
}