Fix NULL pointer exception in audiopwmio

snkYmkrct · snkYmkrct · commit e3c4aebb6763 · 2025-04-07T10:00:24.000+02:00
active_audio was set to NULL, but then used in the following set_pin()
call. because of MPU, this triggered hard fault on the stm32h7.
diff --git a/ports/stm/common-hal/audiopwmio/PWMAudioOut.c b/ports/stm/common-hal/audiopwmio/PWMAudioOut.c
@@ -342,7 +342,6 @@ void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self)
     tim_handle.Instance->CR1 &= ~TIM_CR1_CEN;
     stm_peripherals_timer_free(tim_handle.Instance);
 
-    active_audio = NULL;
     self->stopping = false;
     self->paused = false;
 
@@ -352,6 +351,8 @@ void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self)
         set_pin(1, GPIO_PIN_RESET);
     }
 
+    active_audio = NULL;
+
     // Cannot free buffers here because we may be called from
     // the interrupt handler, and the heap is not reentrant.
 }

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,6 @@ void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self)`
`342`	`342`	`tim_handle.Instance->CR1 &= ~TIM_CR1_CEN;`
`343`	`343`	`stm_peripherals_timer_free(tim_handle.Instance);`
`344`	`344`
`345`		`- active_audio = NULL;`
`346`	`345`	`self->stopping = false;`
`347`	`346`	`self->paused = false;`
`348`	`347`
`@@ -352,6 +351,8 @@ void common_hal_audiopwmio_pwmaudioout_stop(audiopwmio_pwmaudioout_obj_t *self)`
`352`	`351`	`set_pin(1, GPIO_PIN_RESET);`
`353`	`352`	`}`
`354`	`353`
	`354`	`+ active_audio = NULL;`
	`355`	`+`
`355`	`356`	`// Cannot free buffers here because we may be called from`
`356`	`357`	`// the interrupt handler, and the heap is not reentrant.`
`357`	`358`	`}`