generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-28 03:20:13 +01:00
Code Issues Projects Releases Wiki Activity

make sure that reader does not terminate in the middle of a multipart message

Browse Source
This commit is contained in:
Nir Soffer
2010-10-02 10:01:18 +02:00
committed by Martin Sustrik
parent 2142b8918a
commit 1d431190f5
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -30,6 +30,7 @@ Matus Hamorsky <mhamorsky@gmail.com>
Max Wolf <YIDIEPXGXGPN@spammotel.com> Max Wolf <YIDIEPXGXGPN@spammotel.com>
McClain Looney <m@loonsoft.com> McClain Looney <m@loonsoft.com>
Mikael Helbo Kjaer <mhk@designtech.dk> Mikael Helbo Kjaer <mhk@designtech.dk>
Nir Soffer <nirsof@gmail.com>
Pavel Gushcha <pavimus@gmail.com> Pavel Gushcha <pavimus@gmail.com>
Pavol Malosek <malosek@fastmq.com> Pavol Malosek <malosek@fastmq.com>
Pieter Hintjens <ph@imatix.com> Pieter Hintjens <ph@imatix.com>

7
src/xrep.cpp
View File

@@ -101,6 +101,13 @@ void zmq::xrep_t::terminated (reader_t *pipe_)
for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end (); for (inpipes_t::iterator it = inpipes.begin (); it != inpipes.end ();
it++) { it++) {
if (it->reader == pipe_) { if (it->reader == pipe_) {
if (inpipes [current_in].reader == pipe_) {
// A reader is not allowed to terminate in the middle of a
// multipart message.
zmq_assert (!prefetched);
zmq_assert (!more_in);
}
inpipes.erase (it); inpipes.erase (it);
if (terminating) if (terminating)
unregister_term_ack (); unregister_term_ack ();