espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 10:48:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/calloc_failure' into 'master'

Browse Source 
PR: Return on allocation failure

See merge request espressif/esp-mqtt!204
This commit is contained in:
Rocha Euripedes
2024-04-03 15:29:51 +08:00
parent fd21b27a83 c06f1540fe
commit 1edd167dcb
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mqtt5_msg.c
View File

@ -761,7 +761,7 @@ mqtt_message_t *mqtt5_msg_publish(mqtt_connection_t *connection, const char *top
char *response_topic = calloc(1, response_topic_size); char *response_topic = calloc(1, response_topic_size);
if (!response_topic) { if (!response_topic) {
ESP_LOGE(TAG, "Failed to calloc %d memory", response_topic_size); ESP_LOGE(TAG, "Failed to calloc %d memory", response_topic_size);
fail_message(connection); return fail_message(connection);
} }
snprintf(response_topic, response_topic_size, "%s/%s", property->response_topic, resp_info); snprintf(response_topic, response_topic_size, "%s/%s", property->response_topic, resp_info);
if (append_property(connection, MQTT5_PROPERTY_RESPONSE_TOPIC, 2, response_topic, response_topic_size) == -1) { if (append_property(connection, MQTT5_PROPERTY_RESPONSE_TOPIC, 2, response_topic, response_topic_size) == -1) {

5
mqtt_client.c
View File

@ -1659,6 +1659,11 @@ static void esp_mqtt_task(void *pv)
break; break;
} }
if (last_retransmit == 0) {
// connected for first time, set last_retransmit to now, avoid retransmit
last_retransmit = platform_tick_get_ms();
}
// delete long pending messages // delete long pending messages
mqtt_delete_expired_messages(client); mqtt_delete_expired_messages(client);