Merge pull request #1771 from bluca/valgrind_iterator

Problem: Valgrind reports read of freed memory

Merge pull request #1771 from bluca/valgrind_iterator
Problem: Valgrind reports read of freed memory
02120203 · Joe Eli McIlvain · c5bf0dc0 · a9aeb492 · 02120203
Commit 02120203 authored Feb 04, 2016 by Joe Eli McIlvain
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

radio.cpp src/radio.cpp +4 -2

No files found.
--- a/src/radio.cpp
+++ b/src/radio.cpp
@@ -99,9 +99,11 @@ void zmq::radio_t::xwrite_activated (pipe_t *pipe_)
 void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
 {
-    for (subscriptions_t::iterator it = subscriptions.begin (); it != subscriptions.end (); ++it) {
+    for (subscriptions_t::iterator it = subscriptions.begin (); it != subscriptions.end (); ) {
        if (it->second == pipe_) {
-            subscriptions.erase (it);
+            subscriptions.erase (it++);
+        } else {
+            ++it;
        }
    }