MXS-1913: Check session before invoking dcb_foreach callback

If the session is the dummy session, the callback should not be called.
mariadb-corporation · Jun 12, 2018 · 24870e2 · 24870e2
1 parent d910027
commit 24870e2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/server/core/dcb.cc b/server/core/dcb.cc
@@ -2909,10 +2909,15 @@ class SerialDcbTask : public WorkerTask
              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;
+                }
             }
         }
     }