Fix resource leaks in CDM implementation.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 66940e831b73866c0cdccee620dd2e5427b20599..66357b2af5623698ba7186a47b755ff1951bdf03 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -2195,24 +2195,27 @@ void PluginInstance::DeliverBlock(PP_Instance instance,
     decrypt_cb.Run(media::Decryptor::kError, NULL);
     return;
   }
+
   EnterResourceNoLock<PPB_Buffer_API> enter(decrypted_block, true);
+  if (enter.succeeded()) {
+    BufferAutoMapper mapper(enter.object());
+    if (!mapper.data() || !mapper.size()) {
+      decrypt_cb.Run(media::Decryptor::kError, NULL);
+      return;
+    }
 
-  if (!enter.succeeded()) {
-    decrypt_cb.Run(media::Decryptor::kError, NULL);
-    return;
-  }
-  BufferAutoMapper mapper(enter.object());
-  if (!mapper.data() || !mapper.size()) {
+    scoped_refptr<media::DecoderBuffer> decrypted_buffer(
+        media::DecoderBuffer::CopyFrom(
+            reinterpret_cast<const uint8*>(mapper.data()), mapper.size()));
+    decrypted_buffer->SetTimestamp(base::TimeDelta::FromMicroseconds(
+        block_info->tracking_info.timestamp));
+    decrypt_cb.Run(media::Decryptor::kSuccess, decrypted_buffer);
+  } else {
     decrypt_cb.Run(media::Decryptor::kError, NULL);

[ddorwin, 2012/09/05 08:44:44]

Why aren't you returning early (if(!succeeded)) anymore?

     return;
   }
 
-  scoped_refptr<media::DecoderBuffer> decrypted_buffer(
-      media::DecoderBuffer::CopyFrom(
-          reinterpret_cast<const uint8*>(mapper.data()), mapper.size()));
-  decrypted_buffer->SetTimestamp(base::TimeDelta::FromMicroseconds(
-      block_info->tracking_info.timestamp));
-  decrypt_cb.Run(media::Decryptor::kSuccess, decrypted_buffer);
+  PluginModule::GetCore()->ReleaseResource(decrypted_block);

[ddorwin, 2012/09/05 08:44:44]

Does the browser not always take ownership? What happens if one of the errors
above occurs? The plugin won't know about the failure or release it.

[xhwang, 2012/09/05 09:26:55]

Agreed. Is there something like scoped_resource we can use?

 }
 
 void PluginInstance::DeliverFrame(PP_Instance instance,