Merge branch 'bugfix/custom_button_delete_problem' into 'master'

button: fix iot button delete for custom button See merge request ae_group/esp-iot-solution!874
espressif · Oct 27, 2023 · 6586c18 · 6586c18
2 parents e1daa23 + 8811fa7
commit 6586c18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/components/button/CHANGELOG.md b/components/button/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v3.1.2 - 2023-10-24
+
+### bugfix
+
+* Fixed a bug where iot_button_delete feature crashes for custom button
+
 ## v3.1.1 - 2023-10-18
 
 ### bugfix

diff --git a/components/button/idf_component.yml b/components/button/idf_component.yml
@@ -1,4 +1,4 @@
-version: "3.1.1"
+version: "3.1.2"
 description: GPIO and ADC button driver
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/button
 repository: https://github.com/espressif/esp-iot-solution.git

diff --git a/components/button/iot_button.c b/components/button/iot_button.c
@@ -428,10 +428,6 @@ esp_err_t iot_button_delete(button_handle_t btn_handle)
             ret = btn->hal_button_deinit(btn->hardware_data);
         }
 
-        if (btn->hardware_data) {
-            free(btn->hardware_data);
-            btn->hardware_data = NULL;
-        }
         break;
     default:
         break;