summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 23:11:30 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-06 23:11:30 +0000
commit7473b624aff7e1db5b22d7a856d1f21509fa04bc (patch)
treefc04693e197811bc2c487eec4457d4706fc011a4 /chrome/browser/renderer_host
parent11e7e3bd16e35256d1d0a6fd80968aab1b4025f2 (diff)
downloadchromium_src-7473b624aff7e1db5b22d7a856d1f21509fa04bc.zip
chromium_src-7473b624aff7e1db5b22d7a856d1f21509fa04bc.tar.gz
chromium_src-7473b624aff7e1db5b22d7a856d1f21509fa04bc.tar.bz2
Handle CBF_SMBITMAP in the async version of the IPC.
BUG=43307 TEST=NONE Review URL: http://codereview.chromium.org/1973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/resource_message_filter.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 3e26653..9fa1197 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -875,6 +875,10 @@ void ResourceMessageFilter::OnClipboardWriteObjectsAsync(
// the write on the UI thread.
Clipboard::ObjectMap* long_living_objects = new Clipboard::ObjectMap(objects);
+ // This async message doesn't support shared-memory based bitmaps; they must
+ // be removed otherwise we might dereference a rubbish pointer.
+ long_living_objects->erase(Clipboard::CBF_SMBITMAP);
+
ChromeThread::PostTask(
ChromeThread::UI,
FROM_HERE,