Fix resource leaks in CDM implementation.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 2177 matching lines @@
   pending_decryption_cbs_.erase(found);
 
   if (block_info->result == PP_DECRYPTRESULT_DECRYPT_NOKEY) {
     decrypt_cb.Run(media::Decryptor::kNoKey, NULL);
     return;
   }
   if (block_info->result != PP_DECRYPTRESULT_SUCCESS) {
     decrypt_cb.Run(media::Decryptor::kError, NULL);
     return;
   }
-  EnterResourceNoLock<PPB_Buffer_API> enter(decrypted_block, true);
-
-  if (!enter.succeeded()) {
-    decrypt_cb.Run(media::Decryptor::kError, NULL);
-    return;
-  }
-  BufferAutoMapper mapper(enter.object());
-  if (!mapper.data() || !mapper.size()) {
-    decrypt_cb.Run(media::Decryptor::kError, NULL);
-    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);
+  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;
+    }
+
+    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;
+  }
+
+  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,
                                   PP_Resource decrypted_frame,
                                   const PP_DecryptedBlockInfo* block_info) {
   // TODO(tomfinegan): To be implemented after completion of v0.1 of the
   // EME/CDM work.
 }
 
 void PluginInstance::DeliverSamples(PP_Instance instance,
@@ skipping 376 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit