From d80e610cd5bc6a9f6c0cc139e2f07e007fa05428 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 10 Nov 2019 23:09:17 -0500 Subject: Bug 906469 - fix maildir crash while parsing a folder. Tag #1273 --- mailnews/local/src/nsMsgMaildirStore.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mailnews/local') diff --git a/mailnews/local/src/nsMsgMaildirStore.cpp b/mailnews/local/src/nsMsgMaildirStore.cpp index 993abbad5..6f3228938 100644 --- a/mailnews/local/src/nsMsgMaildirStore.cpp +++ b/mailnews/local/src/nsMsgMaildirStore.cpp @@ -1194,6 +1194,7 @@ MaildirStoreParser::~MaildirStoreParser() nsresult MaildirStoreParser::ParseNextMessage(nsIFile *aFile) { nsresult rv; + NS_ENSURE_TRUE(m_db, NS_ERROR_NULL_POINTER); nsCOMPtr inputStream; nsCOMPtr msgParser = do_CreateInstance(NS_PARSEMAILMSGSTATE_CONTRACTID, &rv); @@ -1278,9 +1279,10 @@ void MaildirStoreParser::TimerCallback(nsITimer *aTimer, void *aClosure) parser->m_directoryEnumerator->GetNext(getter_AddRefs(aSupport)); nsresult rv; nsCOMPtr currentFile(do_QueryInterface(aSupport, &rv)); - NS_ENSURE_SUCCESS_VOID(rv); - parser->ParseNextMessage(currentFile); - // ### TODO - what if this fails? + if (NS_SUCCEEDED(rv)) + rv = parser->ParseNextMessage(currentFile); + if (NS_FAILED(rv) && parser->m_listener) + parser->m_listener->OnStopRunningUrl(nullptr, NS_ERROR_FAILURE); } nsresult MaildirStoreParser::StartTimer() -- cgit v1.2.3