]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'bugfix/btdm_add_check_value_length_for_gatts_get_attribute_value' into...
authorJiang Jiang Jian <jack@espressif.com>
Tue, 22 Aug 2017 03:37:56 +0000 (11:37 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Tue, 22 Aug 2017 03:37:56 +0000 (11:37 +0800)
component/bt: add check value and length for esp_ble_gatts_get_attr_value(uint16…

See merge request !1110

1  2 
components/bt/bluedroid/api/esp_gatts_api.c

index 9936cd2fcd383ddf517b37b282768d6a82f8769f,d50db6b967e186311d8f70a1c126e56dd4d1e28f..4d2a6f5f8e2dbe904330c3595309024925933b02
@@@ -308,15 -327,13 +308,15 @@@ esp_err_t esp_ble_gatts_set_attr_value(
                                   btc_gatts_arg_deep_copy) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
  }
  
- esp_err_t esp_ble_gatts_get_attr_value(uint16_t attr_handle, uint16_t *length, const uint8_t **value)
+ esp_gatt_status_t esp_ble_gatts_get_attr_value(uint16_t attr_handle, uint16_t *length, const uint8_t **value)
  {
 +    ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);
 +
      if (attr_handle == ESP_GATT_ILLEGAL_HANDLE) {
-         return ESP_FAIL;
+         return ESP_GATT_INVALID_HANDLE;
      }
-     btc_gatts_get_attr_value(attr_handle, length, (uint8_t **)value);
-     return ESP_OK;
+     return btc_gatts_get_attr_value(attr_handle, length, (uint8_t **)value);
  }
  
  esp_err_t esp_ble_gatts_open(esp_gatt_if_t gatts_if, esp_bd_addr_t remote_bda, bool is_direct)