Bug 1310453 - Check whether aUri isn't created. r?jimm draft
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Mon, 17 Oct 2016 12:17:42 +0900
changeset 425784 9a5c78454872e87cbde3cac5be09869dd6191209
parent 425712 9079d167112122805f99f57bb8856e1b1675af0f
child 533995 e5691ea3ddbb17887e47146a952a287f59145131
push id32508
push userm_kato@ga2.so-net.ne.jp
push dateMon, 17 Oct 2016 03:50:00 +0000
reviewersjimm
bugs1310453
milestone52.0a1
Bug 1310453 - Check whether aUri isn't created. r?jimm Since aUri is nullptr, Firefox will crash on shutdown. MozReview-Commit-ID: E5ENWsjK7Px
widget/windows/nsDataObj.cpp
--- 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;