Bug 632504 - crash on shutdown [@ nsCharTraits<unsigned short>::length(unsigned short const*)] - [@ nsMsgShutdownService::Observe]; r=bienvenu
--- a/mailnews/base/src/nsMsgMailSession.cpp
+++ b/mailnews/base/src/nsMsgMailSession.cpp
@@ -724,17 +724,17 @@ NS_IMETHODIMP nsMsgShutdownService::Obse
if (!mQuitForced)
{
nsCOMPtr<nsISupportsPRBool> stopShutdown = do_QueryInterface(aSubject);
stopShutdown->SetData(PR_TRUE);
// If the attempted quit was a restart, be sure to restart the app once
// the tasks have been run. This is usually the case when addons or
// updates are going to be installed.
- if (nsDependentString(aData).EqualsLiteral("restart"))
+ if (aData && nsDependentString(aData).EqualsLiteral("restart"))
mQuitMode |= nsIAppStartup::eRestart;
}
mMsgProgress->OpenProgressDialog(internalDomWin, topMsgWindow,
"chrome://messenger/content/shutdownWindow.xul",
PR_FALSE, nsnull);
if (mQuitForced)