espressif/esp-mqtt
1
0
Fork 0
mirror of https://github.com/espressif/esp-mqtt.git synced 2026-10-07 08:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Rejects NULL properties in the mqtt5 functions

Browse Source
This commit is contained in:
Euripedes Rocha Filho
2026-09-21 16:24:25 +02:00
parent 39330e1cc0
commit 6ccf20d40e
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mqtt5_client.h
+15 -15
View File
@@ -205,13 +205,13 @@ typedef struct {
/**
* @brief Set MQTT5 client connect property configuration
*
* @param client mqtt client handle
* @param connect_property connect property
* @param client mqtt client handle, must not be NULL
* @param connect_property connect property, must not be NULL
*
* @return
* - ESP_OK on success
* - ESP_ERR_NO_MEM if failed to allocate
* - ESP_ERR_INVALID_ARG on wrong initialization
* - ESP_ERR_INVALID_ARG if client or connect_property is NULL
* - ESP_FAIL on fail
*/
esp_err_t esp_mqtt5_client_set_connect_property(esp_mqtt5_client_handle_t client,
@@ -223,12 +223,12 @@ esp_err_t esp_mqtt5_client_set_connect_property(esp_mqtt5_client_handle_t client
* This API will not store the publish property, it is one-time configuration.
* Before call `esp_mqtt_client_publish` to publish data, call this API to set publish property if have
*
* @param client mqtt client handle
* @param property publish property
* @param client mqtt client handle, must not be NULL
* @param property publish property, must not be NULL
*
* @return
* - ESP_OK on success
* - ESP_ERR_INVALID_ARG on wrong initialization
* - ESP_ERR_INVALID_ARG if client or property is NULL
* - ESP_FAIL on fail
*/
esp_err_t esp_mqtt5_client_set_publish_property(esp_mqtt5_client_handle_t client,
@@ -240,12 +240,12 @@ esp_err_t esp_mqtt5_client_set_publish_property(esp_mqtt5_client_handle_t client
* This API will not store the subscribe property, it is one-time configuration.
* Before call `esp_mqtt_client_subscribe` to subscribe topic, call this API to set subscribe property if have
*
* @param client mqtt client handle
* @param property subscribe property
* @param client mqtt client handle, must not be NULL
* @param property subscribe property, must not be NULL
*
* @return
* - ESP_OK on success
* - ESP_ERR_INVALID_ARG on wrong initialization
* - ESP_ERR_INVALID_ARG if client or property is NULL
* - ESP_FAIL on fail
*/
esp_err_t esp_mqtt5_client_set_subscribe_property(esp_mqtt5_client_handle_t client,
@@ -257,12 +257,12 @@ esp_err_t esp_mqtt5_client_set_subscribe_property(esp_mqtt5_client_handle_t clie
* This API will not store the unsubscribe property, it is one-time configuration.
* Before call `esp_mqtt_client_unsubscribe` to unsubscribe topic, call this API to set unsubscribe property if have
*
* @param client mqtt client handle
* @param property unsubscribe property
* @param client mqtt client handle, must not be NULL
* @param property unsubscribe property, must not be NULL
*
* @return
* - ESP_OK on success
* - ESP_ERR_INVALID_ARG on wrong initialization
* - ESP_ERR_INVALID_ARG if client or property is NULL
* - ESP_FAIL on fail
*/
esp_err_t esp_mqtt5_client_set_unsubscribe_property(esp_mqtt5_client_handle_t client,
@@ -274,13 +274,13 @@ esp_err_t esp_mqtt5_client_set_unsubscribe_property(esp_mqtt5_client_handle_t cl
* This API will not store the disconnect property, it is one-time configuration.
* Before call `esp_mqtt_client_disconnect` to disconnect connection, call this API to set disconnect property if have
*
* @param client mqtt client handle
* @param property disconnect property
* @param client mqtt client handle, must not be NULL
* @param property disconnect property, must not be NULL
*
* @return
* - ESP_OK on success
* - ESP_ERR_NO_MEM if failed to allocate
* - ESP_ERR_INVALID_ARG on wrong initialization
* - ESP_ERR_INVALID_ARG if client or property is NULL
* - ESP_FAIL on fail
*/
esp_err_t esp_mqtt5_client_set_disconnect_property(esp_mqtt5_client_handle_t client,
mqtt5_client.c
+25
View File
@@ -508,6 +508,11 @@ esp_err_t esp_mqtt5_client_set_publish_property(esp_mqtt5_client_handle_t client
return ESP_ERR_INVALID_ARG;
}
if (!property) {
ESP_LOGE(TAG, "Property is NULL");
return ESP_ERR_INVALID_ARG;
}
MQTT_API_LOCK(client);
/* Check protocol version */
@@ -538,6 +543,11 @@ esp_err_t esp_mqtt5_client_set_subscribe_property(esp_mqtt5_client_handle_t clie
return ESP_ERR_INVALID_ARG;
}
if (!property) {
ESP_LOGE(TAG, "Property is NULL");
return ESP_ERR_INVALID_ARG;
}
if (property->retain_handle > 2) {
ESP_LOGE(TAG, "retain_handle only support 0, 1, 2");
return -1;
@@ -586,6 +596,11 @@ esp_err_t esp_mqtt5_client_set_unsubscribe_property(esp_mqtt5_client_handle_t cl
return ESP_ERR_INVALID_ARG;
}
if (!property) {
ESP_LOGE(TAG, "Property is NULL");
return ESP_ERR_INVALID_ARG;
}
MQTT_API_LOCK(client);
/* Check protocol version */
@@ -622,6 +637,11 @@ esp_err_t esp_mqtt5_client_set_disconnect_property(esp_mqtt5_client_handle_t cli
return ESP_ERR_INVALID_ARG;
}
if (!property) {
ESP_LOGE(TAG, "Property is NULL");
return ESP_ERR_INVALID_ARG;
}
MQTT_API_LOCK(client);
/* Check protocol version */
@@ -677,6 +697,11 @@ esp_err_t esp_mqtt5_client_set_connect_property(esp_mqtt5_client_handle_t client
return ESP_ERR_INVALID_ARG;
}
if (!connect_property) {
ESP_LOGE(TAG, "Property is NULL");
return ESP_ERR_INVALID_ARG;
}
MQTT_API_LOCK(client);
/* Check protocol version */