Fix potential race condition in nRF5xn.cpp

Donatien Garnier · Donatien Garnier · commit 7f18938eca48 · 2018-03-08T20:02:01.000Z
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.cpp
@@ -222,8 +222,10 @@ nRF5xn::waitForEvent(void)
 }
 
 void nRF5xn::processEvents() {
-    if (isEventsSignaled) {
+    core_util_critical_section_enter();
+    while (isEventsSignaled) {
         isEventsSignaled = false;
+        core_util_critical_section_exit();
         #if NRF_SD_BLE_API_VERSION >= 5
         // We use the "polling" dispatch model
         // http://infocenter.nordicsemi.com/topic/com.nordic.infocenter.sdk5.v14.2.0/group__nrf__sdh.html?cp=4_0_0_6_11_60_20#gab4d7be69304d4f5feefd1d440cc3e6c7
@@ -232,5 +234,8 @@ void nRF5xn::processEvents() {
         #else
         intern_softdevice_events_execute();
         #endif
+
+        core_util_critical_section_enter();
     }
+    core_util_critical_section_exit();
 }

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,10 @@ nRF5xn::waitForEvent(void)`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`void nRF5xn::processEvents() {`
`225`		`- if (isEventsSignaled) {`
	`225`	`+ core_util_critical_section_enter();`
	`226`	`+ while (isEventsSignaled) {`
`226`	`227`	`isEventsSignaled = false;`
	`228`	`+ core_util_critical_section_exit();`
`227`	`229`	`#if NRF_SD_BLE_API_VERSION >= 5`
`228`	`230`	`// We use the "polling" dispatch model`
`229`	`231`	`// http://infocenter.nordicsemi.com/topic/com.nordic.infocenter.sdk5.v14.2.0/group__nrf__sdh.html?cp=4_0_0_6_11_60_20#gab4d7be69304d4f5feefd1d440cc3e6c7`
`@@ -232,5 +234,8 @@ void nRF5xn::processEvents() {`
`232`	`234`	`#else`
`233`	`235`	`intern_softdevice_events_execute();`
`234`	`236`	`#endif`
	`237`	`+`
	`238`	`+ core_util_critical_section_enter();`
`235`	`239`	`}`
	`240`	`+ core_util_critical_section_exit();`
`236`	`241`	`}`