3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1561 from c-rack/issue-1558

Browse Source 
Solution: check return code of make_fdpair() with zmq_assert
This commit is contained in:
Pieter Hintjens 2015-09-02 23:25:51 +02:00
commit 32d7da1103
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/signaler.cpp
View File

@ -124,10 +124,11 @@ static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
zmq::signaler_t::signaler_t () zmq::signaler_t::signaler_t ()
{ {
// Create the socketpair for signaling. // Create the socketpair for signaling.
if (make_fdpair (&r, &w) == 0) { int rc = make_fdpair (&r, &w);
unblock_socket (w); zmq_assert (rc == 0);
unblock_socket (r);
} unblock_socket (w);
unblock_socket (r);
#ifdef HAVE_FORK #ifdef HAVE_FORK
pid = getpid (); pid = getpid ();
#endif #endif
@ -321,7 +322,8 @@ void zmq::signaler_t::forked ()
// Close file descriptors created in the parent and create new pair // Close file descriptors created in the parent and create new pair
close (r); close (r);
close (w); close (w);
make_fdpair (&r, &w); int rc = make_fdpair (&r, &w);
zmq_assert (rc == 0);
} }
#endif #endif