diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
commit | 11002e70c607255cf91fea0f998fe945ca6ddc5e (patch) | |
tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /src/google/protobuf/compiler/subprocess.cc | |
parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
parent | fde6e89f99eda04a4f1b8677bcea07e6c2040405 (diff) | |
download | protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.gz protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.bz2 protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.zip |
Merge remote-tracking branch 'upstream/master' into csharp-experimental
Diffstat (limited to 'src/google/protobuf/compiler/subprocess.cc')
-rw-r--r-- | src/google/protobuf/compiler/subprocess.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/subprocess.cc b/src/google/protobuf/compiler/subprocess.cc index 61ae4381..a3cff1f8 100644 --- a/src/google/protobuf/compiler/subprocess.cc +++ b/src/google/protobuf/compiler/subprocess.cc @@ -171,7 +171,7 @@ bool Subprocess::Communicate(const Message& input, Message* output, DWORD wait_result = WaitForMultipleObjects(handle_count, handles, FALSE, INFINITE); - HANDLE signaled_handle; + HANDLE signaled_handle = NULL; if (wait_result >= WAIT_OBJECT_0 && wait_result < WAIT_OBJECT_0 + handle_count) { signaled_handle = handles[wait_result - WAIT_OBJECT_0]; |