espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_16202' into 'master'

Browse Source 
fix(esp_http_server): Fix regression in httpd_cookie_key_value introduced by commit 4a47cf8 (GitHub PR)

Closes IDFGH-15573

See merge request espressif/esp-idf!40230
This commit is contained in:
Mahavir Jain
2025-07-03 09:35:00 +05:30
parent bfe5caf58f 42704821d2
commit 09202785f8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_http_server/src/httpd_parse.c
View File

@@ -1165,6 +1165,10 @@ esp_err_t static httpd_cookie_key_value(const char *cookie_str, const char *key,
/* Copy value to the caller's buffer. */
size_t copy_len = MIN(val_len, *val_size - 1);
/* Save actual Cookie value size (including terminating null) */
*val_size = val_len + 1;
/* If buffer length is smaller than needed, return truncation error */
if (copy_len < val_len) {
return ESP_ERR_HTTPD_RESULT_TRUNC;
@@ -1172,9 +1176,6 @@ esp_err_t static httpd_cookie_key_value(const char *cookie_str, const char *key,
memcpy(val, val_ptr, copy_len);
val[copy_len] = '\0';
/* Save actual Cookie value size (including terminating null) */
*val_size = copy_len + 1;
return ESP_OK;
}
ESP_LOGD(TAG, LOG_FMT("cookie %s not found"), key);