Merge pull request #15 from Esri/john4744/fix_inline_race

Store task handle before scheduling to avoid potential race with inlining logic
Esri · Feb 22, 2024 · da7cda7 · da7cda7
2 parents 20be602 + c5af5c2
commit da7cda7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Release/include/pplx/pplx.h b/Release/include/pplx/pplx.h
@@ -143,8 +143,11 @@ class _TaskCollectionImpl
         }
         else
         {
-            _M_pScheduler->schedule(_TaskProcHandle_t::_RunChoreBridge, _PTaskHandle);
+            // Store the task first before scheduling, otherwise a potential race condition
+            // could occur between storing _M_scheduled_task here and _M_scheduled_task being
+            // set to nullptr in _Complete(). 
             _M_scheduled_task.store(_PTaskHandle);
+            _M_pScheduler->schedule(_TaskProcHandle_t::_RunChoreBridge, _PTaskHandle);
         }
     }