Skip to content

Commit

Permalink
Merge pull request zeromq#2591 from laplaceyang/pr_cancel_timer_in_re…
Browse files Browse the repository at this point in the history
…connect

fix bug: coredump if set linger and immediate together
  • Loading branch information
bjovke authored Jun 2, 2017
2 parents bcc30f2 + 67a6594 commit 9980593
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/session_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ void zmq::session_base_t::reconnect ()
pipe->terminate (false);
terminating_pipes.insert (pipe);
pipe = NULL;

if (has_linger_timer) {
cancel_timer (linger_timer_id);
has_linger_timer = false;
}
}

reset ();
Expand Down

0 comments on commit 9980593

Please sign in to comment.