| Index: third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
|
| index cc63e40d3c102100f580ab54d9114c658401a352..a30ac305199ebbee5ef91bb160c30751713d759b 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/subprocess.cc
|
| @@ -1,6 +1,6 @@
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// https://developers.google.com/protocol-buffers/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -42,10 +42,12 @@
|
| #include <signal.h>
|
| #endif
|
|
|
| +#include <google/protobuf/stubs/logging.h>
|
| #include <google/protobuf/stubs/common.h>
|
| #include <google/protobuf/message.h>
|
| #include <google/protobuf/stubs/substitute.h>
|
|
|
| +
|
| namespace google {
|
| namespace protobuf {
|
| namespace compiler {
|
| @@ -449,7 +451,7 @@ bool Subprocess::Communicate(const Message& input, Message* output,
|
| }
|
|
|
| if (!output->ParseFromString(output_data)) {
|
| - *error = "Plugin output is unparseable.";
|
| + *error = "Plugin output is unparseable: " + CEscape(output_data);
|
| return false;
|
| }
|
|
|
|
|