generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 18:40:27 +01:00
Code Issues Projects Releases Wiki Activity

Problem: loop variable modified in loop step and body

Browse Source 
Solution: modify it in loop body only
This commit is contained in:
Simon Giesecke 2019-12-23 12:02:32 +01:00
parent a64c3e6c7d
commit d4cc592387
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dist.cpp
View File

@ -171,9 +171,13 @@ void zmq::dist_t::distribute (msg_t *msg_)
} }
if (msg_->is_vsm ()) { if (msg_->is_vsm ()) {
for (pipes_t::size_type i = 0; i < _matching; ++i) for (pipes_t::size_type i = 0; i < _matching;) {
if (!write (_pipes[i], msg_)) if (!write (_pipes[i], msg_)) {
--i; // Retry last write because index will have been swapped // Use same index again because entry will have been removed.
} else {
++i;
}
}
int rc = msg_->close (); int rc = msg_->close ();
errno_assert (rc == 0); errno_assert (rc == 0);
rc = msg_->init (); rc = msg_->init ();
@ -187,11 +191,14 @@ void zmq::dist_t::distribute (msg_t *msg_)
// Push copy of the message to each matching pipe. // Push copy of the message to each matching pipe.
int failed = 0; int failed = 0;
for (pipes_t::size_type i = 0; i < _matching; ++i) for (pipes_t::size_type i = 0; i < _matching;) {
if (!write (_pipes[i], msg_)) { if (!write (_pipes[i], msg_)) {
++failed; ++failed;
--i; // Retry last write because index will have been swapped // Use same index again because entry will have been removed.
} else {
++i;
} }
}
if (unlikely (failed)) if (unlikely (failed))
msg_->rm_refs (failed); msg_->rm_refs (failed);