From 42704821d2d561623ccf0021d4913503e9863d86 Mon Sep 17 00:00:00 2001 From: iranl Date: Fri, 27 Jun 2025 12:39:13 +0200 Subject: [PATCH] fix(esp_http_server): Fix regression in httpd_cookie_key_value Fix regression in httpd_cookie_key_value introduced by commit 4a47cf8 --- components/esp_http_server/src/httpd_parse.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/esp_http_server/src/httpd_parse.c b/components/esp_http_server/src/httpd_parse.c index 3f1093a742..2fb7504201 100644 --- a/components/esp_http_server/src/httpd_parse.c +++ b/components/esp_http_server/src/httpd_parse.c @@ -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);