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

Merge branch 'fix/check_asprintf_return_value' into 'master'

Browse Source 
fix: using return value of asprintf now

See merge request espressif/esp-mqtt!192
This commit is contained in:
Rocha Euripedes
2023-09-14 19:46:26 +08:00
parent dc93367bd5 c0b40b1293
commit e6afdb4025
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mqtt_client.c
View File

@ -934,18 +934,27 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u
client->config->path = NULL; client->config->path = NULL;
if (puri.field_data[UF_PATH].len || puri.field_data[UF_QUERY].len) { if (puri.field_data[UF_PATH].len || puri.field_data[UF_QUERY].len) {
int asprintf_ret_value;
if (puri.field_data[UF_QUERY].len == 0) { if (puri.field_data[UF_QUERY].len == 0) {
asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off); asprintf_ret_value = asprintf(&client->config->path,
"%.*s",
puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off);
} else if (puri.field_data[UF_PATH].len == 0) { } else if (puri.field_data[UF_PATH].len == 0) {
asprintf(&client->config->path, "/?%.*s", puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off); asprintf_ret_value = asprintf(&client->config->path,
"/?%.*s",
puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
} else { } else {
asprintf(&client->config->path, "%.*s?%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off, asprintf_ret_value = asprintf(&client->config->path,
puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off); "%.*s?%.*s",
puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off,
puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
} }
ESP_MEM_CHECK(TAG, client->config->path, {
if (asprintf_ret_value == -1) {
ESP_LOGE(TAG,"%s(%d): %s", __FUNCTION__, __LINE__, "Memory exhausted");
MQTT_API_UNLOCK(client); MQTT_API_UNLOCK(client);
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
}); }
} }
if (puri.field_data[UF_PORT].len) { if (puri.field_data[UF_PORT].len) {