Index: src/IceBrowserCompileServer.cpp |
diff --git a/src/IceBrowserCompileServer.cpp b/src/IceBrowserCompileServer.cpp |
index 85c2efe89ebc11ea1530bd54c89111a747744686..1cd479348c269c297636dd32bbdd20d5922cac5a 100644 |
--- a/src/IceBrowserCompileServer.cpp |
+++ b/src/IceBrowserCompileServer.cpp |
@@ -81,7 +81,9 @@ char *onEndCallback() { |
// TODO(jvoung): Also return an error string, and UMA data. |
// Set up a report_fatal_error handler to grab that string. |
if (gCompileServer->getErrorCode().value()) { |
- return strdup("Some error occurred"); |
+ std::string Error = ErrorStream->getContents(); |
+ return strdup(Error.empty() ? "Some error occurred" : Error.c_str()); |
+ return strdup(Message); |
jvoung (off chromium)
2015/04/20 21:41:57
remove the dup'ed strdup: "return strdup(Message);
Karl
2015/04/22 22:23:50
Done.
|
} |
return nullptr; |
} |
@@ -142,9 +144,10 @@ void BrowserCompileServer::startCompileThread(int ObjFD) { |
LogStream->SetUnbuffered(); |
EmitStream = getOutputStream(ObjFD); |
EmitStream->SetBufferSize(1 << 14); |
+ ErrorStream = new StringStream(); |
ELFStream.reset(new ELFStreamer(*EmitStream.get())); |
Ctx.reset(new GlobalContext(LogStream.get(), EmitStream.get(), |
- ELFStream.get(), Flags)); |
+ ErrorStream.getStream(), ELFStream.get(), Flags); |
CompileThread = std::thread([this]() { |
Ctx->initParserThread(); |
this->getCompiler().run(ExtraFlags, *Ctx.get(), |