ExternalCommandListener: Fix crash when reading from socket

refs #10700

diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp
index deece0217427998d1866a5d7346b7b6985c838dc..cc484f1f6f32b0e9d773583f498f4fd9c3584363 100644 (file)
--- a/lib/compat/externalcommandlistener.cpp
+++ b/lib/compat/externalcommandlistener.cpp
@@ -110,7 +110,16 @@ void ExternalCommandListener::CommandPipeThread(const String& commandPath)
                        sock->Poll(true, false);
 
                        char buffer[8192];
-                       size_t rc = sock->Read(buffer, sizeof(buffer));
+                       size_t rc;
+
+                       try {
+                               rc = sock->Read(buffer, sizeof(buffer));
+                       } catch (const std::exception& ex) {
+                               Log(LogWarning, "ExternalCommandListener")
+                                   << "Cannot read from socket." << DiagnosticInformation(ex);
+                               break;
+                       }
+
                        if (rc <= 0)
                                break;