diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 18:47:05 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 18:47:05 +0000 |
| commit | ea0b6116e94fb7bbedac074d534ee8c070384ecc (patch) | |
| tree | 11304c682f4bba6e6197f6c51717198da549401b /chrome/browser/download/save_package.cc | |
| parent | 0b6af7774219645c8c62efde75b9e38fc8451691 (diff) | |
| download | chromium_src-ea0b6116e94fb7bbedac074d534ee8c070384ecc.zip chromium_src-ea0b6116e94fb7bbedac074d534ee8c070384ecc.tar.gz chromium_src-ea0b6116e94fb7bbedac074d534ee8c070384ecc.tar.bz2 | |
Fix save complete web page crasher
Repeatedly saving a page may cause a crash. See the bug for a full discussion. This fixes that by making sure the curretn SavePackage is the same one that called into SaveFileManager::RenameAllFiles.
One more hack on the giant, teetering pile of hacks that is the SavePackage system. Can't hurt, right?
BUG=42454
TEST=see bug
Review URL: http://codereview.chromium.org/1729016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/save_package.cc')
| -rw-r--r-- | chrome/browser/download/save_package.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index d58cc48..c276517 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -68,6 +68,9 @@ struct SavePackageParam { namespace { +// A counter for uniquely identifying each save package. +int g_save_package_id = 0; + // Default name which will be used when we can not get proper name from // resource URL. const FilePath::CharType kDefaultSaveName[] = @@ -165,6 +168,7 @@ SavePackage::SavePackage(TabContents* web_content, all_save_items_count_(0), wait_state_(INITIALIZE), tab_id_(web_content->GetRenderProcessHost()->id()), + unique_id_(g_save_package_id++), ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { DCHECK(web_content); const GURL& current_page_url = GetUrlToBeSaved(); @@ -190,6 +194,7 @@ SavePackage::SavePackage(TabContents* tab_contents) all_save_items_count_(0), wait_state_(INITIALIZE), tab_id_(tab_contents->GetRenderProcessHost()->id()), + unique_id_(g_save_package_id++), ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { const GURL& current_page_url = GetUrlToBeSaved(); @@ -216,6 +221,7 @@ SavePackage::SavePackage(TabContents* tab_contents, all_save_items_count_(0), wait_state_(INITIALIZE), tab_id_(0), + unique_id_(g_save_package_id++), ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { DCHECK(!saved_main_file_path_.empty() && saved_main_file_path_.value().length() <= kMaxFilePathLength); @@ -642,7 +648,8 @@ void SavePackage::CheckFinish() { final_names, dir, tab_contents_->GetRenderProcessHost()->id(), - tab_contents_->render_view_host()->routing_id())); + tab_contents_->render_view_host()->routing_id(), + id())); } // Successfully finished all items of this SavePackage. |