espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak in esp_bt_hidh_dev_report_write and esp_bt_hidh_dev_set_report in bt_hidh.c

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/9323
This commit is contained in:
liqigan
2022-07-11 11:55:35 +08:00
parent 4644e2c302
commit ea63a42f15
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
components/esp_hid/src/bt_hidh.c
View File

@@ -1,16 +1,8 @@
// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "bt_hidh.h" #include "bt_hidh.h"
#if CONFIG_BT_HID_HOST_ENABLED #if CONFIG_BT_HID_HOST_ENABLED
@@ -803,8 +795,13 @@ static esp_err_t esp_bt_hidh_dev_report_write(esp_hidh_dev_t *dev, size_t map_in
data = p_data; data = p_data;
len = len + 1; len = len + 1;
} }
ret = esp_bt_hid_host_send_data(dev->bda, data, len); ret = esp_bt_hid_host_send_data(dev->bda, data, len);
if (p_data) {
free(p_data);
}
} while (0); } while (0);
return ret; return ret;
} }
@@ -845,11 +842,17 @@ static esp_err_t esp_bt_hidh_dev_set_report(esp_hidh_dev_t *dev, size_t map_inde
data = p_data; data = p_data;
len = len + 1; len = len + 1;
} }
ret = esp_bt_hid_host_set_report(dev->bda, report_type, data, len); ret = esp_bt_hid_host_set_report(dev->bda, report_type, data, len);
if (p_data) {
free(p_data);
}
if (ret == ESP_OK) { if (ret == ESP_OK) {
set_trans(dev, ESP_HID_TRANS_SET_REPORT); set_trans(dev, ESP_HID_TRANS_SET_REPORT);
} }
} while (0); } while (0);
return ret; return ret;
} }

1
tools/ci/check_copyright_ignore.txt
View File

@@ -446,7 +446,6 @@ components/esp_hid/private/ble_hidh.h
components/esp_hid/private/bt_hidd.h components/esp_hid/private/bt_hidd.h
components/esp_hid/private/bt_hidh.h components/esp_hid/private/bt_hidh.h
components/esp_hid/private/esp_hidd_private.h components/esp_hid/private/esp_hidd_private.h
components/esp_hid/src/bt_hidh.c
components/esp_hid/src/esp_hid_common.c components/esp_hid/src/esp_hid_common.c
components/esp_hid/src/esp_hidd.c components/esp_hid/src/esp_hidd.c
components/esp_hid/test/hid_descriptor.h components/esp_hid/test/hid_descriptor.h