alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mcpwm_capture_getedge_null_deref' into 'master'

Browse Source 
Bugfix(MCPWM):  Fix dereferencing of a null pointer in function mcpwm_capture_signal_get_edge

See merge request espressif/esp-idf!9255
This commit is contained in:
Michael (XIAO Xufeng) 2020-08-17 15:52:24 +08:00
commit dc22501b47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/soc/src/hal/mcpwm_hal.c
View File

@ -214,8 +214,9 @@ esp_err_t mcpwm_hal_capture_get_result(mcpwm_hal_context_t *hal, int cap_sig, ui
if (out_edge) {
*out_edge = mcpwm_ll_get_captured_edge(hal->dev, cap_sig);
}
*out_count = mcpwm_ll_get_capture_val(hal->dev, cap_sig);
if (out_count) {
*out_count = mcpwm_ll_get_capture_val(hal->dev, cap_sig);
}
if (mcpwm_ll_get_intr(hal->dev) & sig_intr) {
mcpwm_ll_clear_intr(hal->dev, sig_intr);
}