Bug 1310453 - Check whether aUri isn't created. r?jimm
Since aUri is nullptr, Firefox will crash on shutdown.
MozReview-Commit-ID: E5ENWsjK7Px
--- a/widget/windows/nsDataObj.cpp
+++ b/widget/windows/nsDataObj.cpp
@@ -1127,19 +1127,21 @@ HRESULT
nsDataObj :: GetFileContentsInternetShortcut ( FORMATETC& aFE, STGMEDIUM& aSTG )
{
static const char * kShellIconPref = "browser.shell.shortcutFavicons";
nsAutoString url;
if ( NS_FAILED(ExtractShortcutURL(url)) )
return E_OUTOFMEMORY;
nsCOMPtr<nsIURI> aUri;
- NS_NewURI(getter_AddRefs(aUri), url);
+ nsresult rv = NS_NewURI(getter_AddRefs(aUri), url);
+ if (NS_FAILED(rv)) {
+ return E_FAIL;
+ }
- nsresult rv;
nsAutoCString asciiUrl;
rv = aUri->GetAsciiSpec(asciiUrl);
if (NS_FAILED(rv)) {
return E_FAIL;
}
const char *shortcutFormatStr;
int totalLen;