Properly fix crash in nsDownloadManager when repeatedly pausing and resuming a download

This applies only to applications that do not use JSDownloads and is based on Bug 1224326

1 files changed, 4 insertions, 1 deletions

diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
index 9f43ade2c4..587c1ac8ab 100644
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -1829,6 +1829,9 @@ nsDownloadManager::RetryDownload(nsDownload* dl)
       return rv;
   }
 
+  rv = NotifyDownloadRemoval(dl);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   // reset time and download progress
   dl->SetStartTime(PR_Now());
   dl->SetProgressBytes(0, -1);
@@ -3083,7 +3086,7 @@ nsDownload::OnStateChange(nsIWebProgress *aWebProgress,
 #else
       (void)SetState(nsIDownloadManager::DOWNLOAD_FINISHED);
 #endif
-    } else {
+    } else if (aStatus != NS_BINDING_ABORTED) {
       // We failed for some unknown reason -- fail with a generic message
       (void)FailDownload(aStatus, nullptr);
     }