Merge branch 'contrib/github_pr_18734_v6.0' into 'release/v6.0'

Fix header value truncation detection in httpd_req_get_hdr_value_str (GitHub PR) (v6.0)

See merge request espressif/esp-idf!50537
This commit is contained in:
Mahavir Jain
2026-07-10 13:45:28 +05:30

View File

@@ -1132,12 +1132,13 @@ esp_err_t httpd_req_get_hdr_value_str(httpd_req_t *r, const char *field, char *v
}
/* Get the NULL terminated value and copy it to the caller's buffer.
* Note `strlcpy()` will always return the size of the source string
* including terminating null. */
* strlcpy() returns strlen() of the source string (the terminating
* null is NOT counted), so only val_size - 1 characters fit. */
size_t full_size = strlcpy(val, val_ptr, val_size);
/* If buffer length is smaller than needed, return truncation error */
if (val_size < full_size) {
/* If the value did not fit in the buffer it was truncated, i.e. its
* length reached or exceeded val_size. Return truncation error. */
if (val_size <= full_size) {
return ESP_ERR_HTTPD_RESULT_TRUNC;
}
return ESP_OK;