Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: util/win/registration_protocol_win.cc

Issue 1337953003: win: Fix pipe leak on connection (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: pcheck createthread Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « util/win/exception_handler_server.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: util/win/registration_protocol_win.cc
diff --git a/util/win/registration_protocol_win.cc b/util/win/registration_protocol_win.cc
index a4a3c1c89449d163ebd9b26c38d0aef285198d01..3e0fdf213985a4bc81ae295bd3377140463045da 100644
--- a/util/win/registration_protocol_win.cc
+++ b/util/win/registration_protocol_win.cc
@@ -17,6 +17,7 @@
#include <windows.h>
#include "base/logging.h"
+#include "util/win/scoped_handle.h"
namespace crashpad {
@@ -25,26 +26,27 @@ bool SendToCrashHandlerServer(const base::string16& pipe_name,
crashpad::ServerToClientMessage* response) {
int tries = 5;
while (tries > 0) {
- HANDLE pipe = CreateFile(pipe_name.c_str(),
- GENERIC_READ | GENERIC_WRITE,
- 0,
- nullptr,
- OPEN_EXISTING,
- SECURITY_SQOS_PRESENT | SECURITY_IDENTIFICATION,
- nullptr);
- if (pipe == INVALID_HANDLE_VALUE) {
+ ScopedFileHANDLE pipe(
+ CreateFile(pipe_name.c_str(),
+ GENERIC_READ | GENERIC_WRITE,
+ 0,
+ nullptr,
+ OPEN_EXISTING,
+ SECURITY_SQOS_PRESENT | SECURITY_IDENTIFICATION,
+ nullptr));
+ if (!pipe.is_valid()) {
Sleep(10);
--tries;
continue;
}
DWORD mode = PIPE_READMODE_MESSAGE;
- if (!SetNamedPipeHandleState(pipe, &mode, nullptr, nullptr)) {
+ if (!SetNamedPipeHandleState(pipe.get(), &mode, nullptr, nullptr)) {
PLOG(ERROR) << "SetNamedPipeHandleState";
return false;
}
DWORD bytes_read = 0;
BOOL result = TransactNamedPipe(
- pipe,
+ pipe.get(),
// This is [in], but is incorrectly declared non-const.
const_cast<crashpad::ClientToServerMessage*>(&message),
sizeof(message),
« no previous file with comments | « util/win/exception_handler_server.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698