HPCC-32768 Ensure setActivity() destroys activities outside the criti…

…cal section Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Oct 2, 2024 · 8fd7d13 · 8fd7d13
1 parent 50ed84f
commit 8fd7d13
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/roxie/ccd/ccdqueue.cpp b/roxie/ccd/ccdqueue.cpp
@@ -1409,8 +1409,12 @@ class CRoxieWorker : public CInterface, implements IPooledThread
     }
     inline void setActivity(IRoxieAgentActivity *act)
     {
-        CriticalBlock b(actCrit);
-        activity.setown(act);
+        //Ensure that the activity is released outside of the critical section
+        Owned<IRoxieAgentActivity> temp(act);
+        {
+            CriticalBlock b(actCrit);
+            activity.swap(temp);
+        }
     }
     inline bool match(RoxiePacketHeader &h)
     {