diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 20:08:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 20:08:19 +0000 |
| commit | da196c607637ba8e31af81078564fd57894ef913 (patch) | |
| tree | 3836a9217c848110a3c5c372a351d85958218bad /chrome/plugin | |
| parent | 98299483b0b891bc245c946b5bf2608e5904db25 (diff) | |
| download | chromium_src-da196c607637ba8e31af81078564fd57894ef913.zip chromium_src-da196c607637ba8e31af81078564fd57894ef913.tar.gz chromium_src-da196c607637ba8e31af81078564fd57894ef913.tar.bz2 | |
Fix double delete in NPObjectStub that I introduced.
TBR=ananta
BUG=23713, 23706
Review URL: http://codereview.chromium.org/251105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/npobject_stub.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index 9f07211..7b0e213 100644 --- a/chrome/plugin/npobject_stub.cc +++ b/chrome/plugin/npobject_stub.cc @@ -87,7 +87,9 @@ void NPObjectStub::OnMessageReceived(const IPC::Message& msg) { } void NPObjectStub::OnChannelError() { - delete this; + // If npobject_ is NULLed out, that means a DeleteSoon is happening. + if (npobject_) + delete this; } void NPObjectStub::OnRelease(IPC::Message* reply_msg) { |