Avoid leaking SerializedHandles.

ppapi/proxy/serialized_structs.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 "ppapi/proxy/serialized_structs.h"
 
 #include "base/pickle.h"
+#include "base/platform_file.h"
+#include "base/shared_memory.h"
+#include "build/build_config.h"
+#include "ipc/ipc_platform_file.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/shared_impl/var.h"
 
+#if defined(OS_NACL)
+#include <unistd.h>
+#endif
+
 namespace ppapi {
 namespace proxy {
 
 SerializedFontDescription::SerializedFontDescription()
     : face(),
       family(0),
       size(0),
       weight(0),
       italic(PP_FALSE),
       small_caps(PP_FALSE),
@@ skipping 76 matching lines @@
 }
 
 bool SerializedHandle::IsHandleValid() const {
   if (type_ == SHARED_MEMORY)
     return base::SharedMemory::IsHandleValid(shm_handle_);
   else if (type_ == SOCKET || type_ == CHANNEL_HANDLE)
     return !(IPC::InvalidPlatformFileForTransit() == descriptor_);
   return false;
 }
 
+void SerializedHandle::Close() {
+  if (IsHandleValid()) {
+    switch (type_) {
+      case INVALID:
+        NOTREACHED();
+        break;
+      case SHARED_MEMORY:
+        base::SharedMemory::CloseHandle(shm_handle_);
+        break;
+      case SOCKET:
+      case CHANNEL_HANDLE:
+        base::PlatformFile file =
+            IPC::PlatformFileForTransitToPlatformFile(descriptor_);
+#if !defined(OS_NACL)
+        base::ClosePlatformFile(file);
+#else
+        close(file);
+#endif
+        break;
+      // No default so the compiler will warn us if a new type is added.
+    }
+  }
+  *this = SerializedHandle();
+}
+
 // static
 bool SerializedHandle::WriteHeader(const Header& hdr, Pickle* pickle) {
   if (!pickle->WriteInt(hdr.type))
     return false;
   if (hdr.type == SHARED_MEMORY) {
     if (!pickle->WriteUInt32(hdr.size))
       return false;
   }
   return true;
 }
@@ skipping 21 matching lines @@
       break;
     // No default so the compiler will warn us if a new type is added.
   }
   if (valid_type)
     hdr->type = Type(type);
   return valid_type;
 }
 
 }  // namespace proxy
 }  // namespace ppapi