From 3d8996796c359473f9ace38e7422b19b44dba103 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 3 Dec 2012 18:56:34 +0000 Subject: [PATCH] Add patch to fix crash in DomStorageArea::CommitChanges (issue #809). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@934 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/patch/patch.cfg | 5 +++++ cef1/patch/patches/dom_storage_809.patch | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 cef1/patch/patches/dom_storage_809.patch diff --git a/cef1/patch/patch.cfg b/cef1/patch/patch.cfg index 7f0711026..253d51caa 100644 --- a/cef1/patch/patch.cfg +++ b/cef1/patch/patch.cfg @@ -21,6 +21,11 @@ patches = [ 'name': 'zlib', 'path': '../third_party/zlib/', }, + { + # http://code.google.com/p/chromiumembedded/issues/detail?id=809 + 'name': 'dom_storage_809', + 'path': '../webkit/dom_storage/', + }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=364 'name': 'spi_webcore_364', diff --git a/cef1/patch/patches/dom_storage_809.patch b/cef1/patch/patches/dom_storage_809.patch new file mode 100644 index 000000000..6a790a480 --- /dev/null +++ b/cef1/patch/patches/dom_storage_809.patch @@ -0,0 +1,18 @@ +Index: dom_storage_area.cc +=================================================================== +--- dom_storage_area.cc (revision 157234) ++++ dom_storage_area.cc (working copy) +@@ -289,8 +289,11 @@ + void DomStorageArea::CommitChanges(const CommitBatch* commit_batch) { + // This method executes on the commit sequence. + DCHECK(task_runner_->IsRunningOnCommitSequence()); +- bool success = backing_->CommitChanges(commit_batch->clear_all_first, +- commit_batch->changed_values); ++ bool success = false; ++ if (backing_.get()) { ++ success = backing_->CommitChanges(commit_batch->clear_all_first, ++ commit_batch->changed_values); ++ } + DCHECK(success); // TODO(michaeln): what if it fails? + task_runner_->PostTask( + FROM_HERE,