Dup command-buffer SHM handle before auto-closing.

base/sync_socket_posix.cc

 // Copyright (c) 2009 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 "base/sync_socket.h"
 
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ skipping 45 matching lines @@
   }
 #endif
   // Copy the handles out for successful return.
   tmp_sockets[0]->handle_ = handles[0];
   pair[0] = tmp_sockets[0];
   tmp_sockets[1]->handle_ = handles[1];
   pair[1] = tmp_sockets[1];
   return true;
 
  cleanup:
-  if (handles[0] != kInvalidHandle)
-    (void) close(handles[0]);
-  if (handles[1] != kInvalidHandle)
-    (void) close(handles[1]);
+  if (handles[0] != kInvalidHandle) {
+    if (HANDLE_EINTR(close(handles[0])) < 0)
+      PLOG(ERROR) << "close";
+  }
+  if (handles[1] != kInvalidHandle) {
+    if (HANDLE_EINTR(close(handles[1])) < 0)
+      PLOG(ERROR) << "close";
+  }
   delete tmp_sockets[0];
   delete tmp_sockets[1];
   return false;
 }
 
 bool SyncSocket::Close() {
   if (handle_ == kInvalidHandle) {
     return false;
   }
-  int retval = close(handle_);
+  int retval = HANDLE_EINTR(close(handle_));
+  if (retval < 0)
+    PLOG(ERROR) << "close";
   handle_ = kInvalidHandle;
   return (retval == 0);
 }
 
 size_t SyncSocket::Send(const void* buffer, size_t length) {
   DCHECK(length <= kMaxMessageLength);
   const char* charbuffer = static_cast<const char*>(buffer);
   int len = file_util::WriteFileDescriptor(handle_, charbuffer, length);
   return static_cast<size_t>(len);
 }
@@ skipping 11 matching lines @@
 size_t SyncSocket::Peek() {
   int number_chars;
   if (-1 == ioctl(handle_, FIONREAD, &number_chars)) {
     // If there is an error in ioctl, signal that the channel would block.
     return 0;
   }
   return (size_t) number_chars;
 }
 
 }  // namespace base