You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/06/04 22:32:47 UTC

git commit: Fixed a segfault in libprocess.

Repository: mesos
Updated Branches:
  refs/heads/master 81c05c973 -> ff8f2870d


Fixed a segfault in libprocess.

Review: https://reviews.apache.org/r/22247


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ff8f2870
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ff8f2870
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ff8f2870

Branch: refs/heads/master
Commit: ff8f2870d79a446a840012396d94542abb33752f
Parents: 81c05c9
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Wed Jun 4 13:25:52 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Wed Jun 4 13:26:26 2014 -0700

----------------------------------------------------------------------
 3rdparty/libprocess/src/process.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/ff8f2870/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 8501d2f..0c0fca7 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -1280,8 +1280,8 @@ void receiving_connect(struct ev_loop* loop, ev_io* watcher, int revents)
     // Connect failure.
     VLOG(1) << "Socket error while connecting";
     socket_manager->close(s);
-    DataDecoder* decoder = (DataDecoder*) watcher->data;
-    delete decoder;
+    Socket* socket = (Socket*) watcher->data;
+    delete socket;
     ev_io_stop(loop, watcher);
     delete watcher;
   } else {