MXS-1913: Check session before invoking dcb_foreach callback

If the session is the dummy session, the callback should not be called.
2018-06-12 09:31:24 +03:00 · 2018-06-12 09:31:24 +03:00 · 24870e278c
commit 24870e278c
parent d9100278b0
1 changed files with 8 additions and 3 deletions
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@ -2909,10 +2909,15 @@ public:
             dcb && atomic_load_int32(&m_more);
             dcb = dcb->thread.next)
        {
-            if (!m_func(dcb, m_data))
+            ss_dassert(dcb->session);
+
+            if (dcb->session->state != SESSION_STATE_DUMMY)
            {
-                atomic_store_int32(&m_more, 0);
-                break;
+                if (!m_func(dcb, m_data))
+                {
+                    atomic_store_int32(&m_more, 0);
+                    break;
+                }
            }
        }
    }