diff options
| -rw-r--r-- | chrome/browser/cocoa/objc_zombie.mm | 2 | ||||
| -rw-r--r-- | ipc/file_descriptor_set_posix.cc | 6 | ||||
| -rw-r--r-- | ipc/ipc_channel_posix.cc | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/objc_zombie.mm b/chrome/browser/cocoa/objc_zombie.mm index c450d2a..8a15398 100644 --- a/chrome/browser/cocoa/objc_zombie.mm +++ b/chrome/browser/cocoa/objc_zombie.mm @@ -100,7 +100,7 @@ DestructFn* LookupObjectCxxDestruct() { // them into |g_zombies| to be freed later. void ZombieDealloc(id self, SEL _cmd) { // This code should only be called when it is implementing |-dealloc|. - DCHECK_EQ(_cmd, @selector(dealloc)); + //DCHECK_EQ(_cmd, @selector(dealloc)); // clang // Use the original |-dealloc| if the object doesn't wish to be // zombied. diff --git a/ipc/file_descriptor_set_posix.cc b/ipc/file_descriptor_set_posix.cc index 3796fae..7f17322 100644 --- a/ipc/file_descriptor_set_posix.cc +++ b/ipc/file_descriptor_set_posix.cc @@ -30,7 +30,8 @@ FileDescriptorSet::~FileDescriptorSet() { for (unsigned i = consumed_descriptor_highwater_; i < descriptors_.size(); ++i) { if (descriptors_[i].auto_close) - HANDLE_EINTR(close(descriptors_[i].fd)); + if (HANDLE_EINTR(close(descriptors_[i].fd)) < 0) + PLOG(ERROR) << "close"; } } @@ -113,7 +114,8 @@ void FileDescriptorSet::CommitAll() { for (std::vector<base::FileDescriptor>::iterator i = descriptors_.begin(); i != descriptors_.end(); ++i) { if (i->auto_close) - HANDLE_EINTR(close(i->fd)); + if (HANDLE_EINTR(close(i->fd)) < 0) + PLOG(ERROR) << "close"; } descriptors_.clear(); consumed_descriptor_highwater_ = 0; diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 2fc1a18..6e8e2642 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -200,7 +200,8 @@ bool ServerAcceptFifoConnection(int server_listen_fd, int* server_socket) { if (accept_fd < 0) return false; if (fcntl(accept_fd, F_SETFL, O_NONBLOCK) == -1) { - HANDLE_EINTR(close(accept_fd)); + if (HANDLE_EINTR(close(accept_fd)) < 0) + PLOG(ERROR) << "close"; return false; } |