ExternalCommandListener: Fix crash when reading from socket

refs #10700
Icinga · Feb 23, 2016 · 0516cb5 · 0516cb5
1 parent ec9caa4
commit 0516cb5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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;