Bug 409179 - Inconsistent autoresume state causes download manager instantiation to fail (can lead to crash). r=Mardak

This commit is contained in:
sdwilsh@shawnwilsher.com 2008-02-21 19:50:01 -08:00
parent 2bbfd20d93
commit 458fdbc8a3
3 changed files with 81 additions and 0 deletions

View File

@ -716,6 +716,27 @@ nsDownloadManager::RestoreDatabaseState()
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
// Switch any download that is supposed to automatically resume and is in a
// finished state to *not* automatically resume. See Bug 409179 for details.
rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
"UPDATE moz_downloads "
"SET autoResume = ?1 "
"WHERE state = ?2 "
"AND autoResume = ?3"),
getter_AddRefs(stmt));
NS_ENSURE_SUCCESS(rv, rv);
i = 0;
rv = stmt->BindInt32Parameter(i++, nsDownload::DONT_RESUME);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->BindInt32Parameter(i++, nsIDownloadManager::DOWNLOAD_FINISHED);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->BindInt32Parameter(i++, nsDownload::AUTO_RESUME);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
return NS_OK;
}
@ -2317,6 +2338,9 @@ nsDownload::Finalize()
// Remove ourself from the active downloads
(void)mDownloadManager->mCurrentDownloads.RemoveObject(this);
// Make sure we do not automatically resume
mAutoResume = DONT_RESUME;
}
nsresult

View File

@ -0,0 +1,57 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Download Manager Test Code.
*
* The Initial Developer of the Original Code is
* Mozilla Corporation.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Shawn Wilsher <me@shawnwilsher.com> (Original Author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
// This file ensures that the download manager service can be instantiated with
// a certain downloads.sqlite file that had incorrect data.
cleanup();
importDownloadsFile("bug_409179_downloads.sqlite");
function run_test()
{
var caughtException = false;
try {
var dm = Cc["@mozilla.org/download-manager;1"].
getService(Ci.nsIDownloadManager);
} catch (e) {
caughtException = true;
}
do_check_false(caughtException);
cleanup();
}