Skip to content

W
wine-cw
Commit a901983f authored by Andrew Bogott's avatar Andrew Bogott Committed by Alexandre Julliard
Browse files
Options

winemenubuilder: Avoid passing a null pointer (or a non-pointer) to extract_icon…

winemenubuilder: Avoid passing a null pointer (or a non-pointer) to extract_icon in InvokeShellLinkerForURL.
parent 5205d038
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
programs/winemenubuilder/winemenubuilder.c
View file @ a901983f
......@@ -2752,9 +2752,12 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
hr = IPropertyStorage_ReadMultiple(pPropStg, 2, ps, pv);
if (SUCCEEDED(hr))
{
icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait );
if (pv[0].vt == VT_LPWSTR && pv[0].u.pwszVal)
{
icon_name = extract_icon( pv[0].u.pwszVal, pv[1].u.iVal, NULL, bWait );
WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name);
WINE_TRACE("URL icon path: %s icon index: %d icon name: %s\n", wine_dbgstr_w(pv[0].u.pwszVal), pv[1].u.iVal, icon_name);
}
PropVariantClear(&pv[0]);
PropVariantClear(&pv[1]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment