Browse Source

[master] Fixing hang in the text causing memory corruption and hang.

Okayed on Jabber.
Marcin Siodelski 8 years ago
parent
commit
87da3cd1ff

+ 2 - 1
src/bin/agent/tests/ca_command_mgr_unittests.cc

@@ -318,7 +318,8 @@ TEST_F(CtrlAgentCommandMgrTest, failForwardToServer) {
 /// Check that control command is not forwarded if the service is not specified.
 TEST_F(CtrlAgentCommandMgrTest, noService) {
     testForward(CtrlAgentCfgContext::TYPE_DHCP6, "",
-                isc::config::CONTROL_RESULT_COMMAND_UNSUPPORTED);
+                isc::config::CONTROL_RESULT_COMMAND_UNSUPPORTED,
+                -1, -1, 0);
 }
 
 /// Check that error is returned to the client when the server to which the

+ 7 - 1
src/lib/asiolink/testutils/test_server_unix_socket.cc

@@ -61,7 +61,13 @@ public:
     ///
     /// @param bytes_transferred Number of bytes received.
     void
-    readHandler(const boost::system::error_code&, size_t bytes_transferred) {
+    readHandler(const boost::system::error_code& ec,
+                size_t bytes_transferred) {
+        // This is most likely due to the abort.
+        if (ec) {
+            return;
+        }
+
         if (!custom_response_.empty()) {
             boost::asio::write(*socket_,
                boost::asio::buffer(custom_response_.c_str(), custom_response_.size()));