alex/esp-rainmaker
1
0
Fork 0
mirror of https://github.com/espressif/esp-rainmaker.git synced 2026-01-15 04:18:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/strncpy_usage' into 'master'

Browse Source 
esp_rmaker_core: Fix usage of strncpy

See merge request app-frameworks/esp-rainmaker!128
This commit is contained in:
Piyush Shah
2020-07-11 11:07:03 +08:00
parent 6692278a2f c1831248ea
commit 27ec6dfef4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_rmaker_core/src/esp_rmaker_claim.c
View File

@@ -435,9 +435,10 @@ esp_err_t __esp_rmaker_self_claim_init(void)
*/
void *csr = esp_rmaker_get_client_csr();
if (csr) {
snprintf(g_claim_data->payload, MAX_PAYLOAD_SIZE, "{\"mac_addr\":\"%s\",\"platform\":\"esp32s2\"}",
snprintf(g_claim_data->payload, sizeof(g_claim_data->payload), "{\"mac_addr\":\"%s\",\"platform\":\"esp32s2\"}",
esp_rmaker_get_node_id());
strncpy((char *)g_claim_data->csr, csr, sizeof(g_claim_data->csr));
strncpy((char *)g_claim_data->csr, csr, (sizeof(g_claim_data->csr) - 1));
g_claim_data->csr[sizeof(g_claim_data->csr) - 1] = 0
free(csr);
ESP_LOGI(TAG, "CSR already exists. No need to re-initialise Claiming.");
return ESP_OK;
@@ -481,7 +482,7 @@ esp_err_t __esp_rmaker_self_claim_init(void)
} else {
ESP_LOGI(TAG, "Self Claiming initialised successfully.");
}
snprintf(g_claim_data->payload, MAX_PAYLOAD_SIZE, "{\"mac_addr\":\"%s\",\"platform\":\"esp32s2\"}",
snprintf(g_claim_data->payload, sizeof(g_claim_data->payload), "{\"mac_addr\":\"%s\",\"platform\":\"esp32s2\"}",
esp_rmaker_get_node_id());
return err;
}