| Index: webkit/plugins/ppapi/message_channel.cc
|
| diff --git a/webkit/plugins/ppapi/message_channel.cc b/webkit/plugins/ppapi/message_channel.cc
|
| index f13911495eefa7155718377475590780d410b174..2dbd1fe8a6407f670774e65fc74469303795b504 100644
|
| --- a/webkit/plugins/ppapi/message_channel.cc
|
| +++ b/webkit/plugins/ppapi/message_channel.cc
|
| @@ -412,7 +412,8 @@ MessageChannel::~MessageChannel() {
|
| void MessageChannel::SetPassthroughObject(NPObject* passthrough) {
|
| // Retain the passthrough object; We need to ensure it lives as long as this
|
| // MessageChannel.
|
| - WebBindings::retainObject(passthrough);
|
| + if (passthrough)
|
| + WebBindings::retainObject(passthrough);
|
|
|
| // If we had a passthrough set already, release it. Note that we retain the
|
| // incoming passthrough object first, so that we behave correctly if anyone
|
|
|