Merge branch 'web_server_use_arg_api' into integration

This commit is contained in:
J. Nick Koston
2026-02-11 18:55:06 -06:00
2 changed files with 7 additions and 5 deletions

View File

@@ -55,13 +55,16 @@ optional<std::string> query_key_value(const char *query_url, size_t query_len, c
return {};
}
char val[CONFIG_HTTPD_MAX_URI_LEN + 1];
if (httpd_query_key_value(query_url, key, val, query_len) != ESP_OK) {
// Value can't exceed query_len. Use small stack buffer for typical values,
// heap fallback for long ones (e.g. base64 IR data) to limit stack usage
// since callers may also have stack buffers for the query string.
SmallBufferWithHeapFallback<128, char> val(query_len);
if (httpd_query_key_value(query_url, key, val.get(), query_len) != ESP_OK) {
return {};
}
url_decode(val);
return {val};
url_decode(val.get());
return {val.get()};
}
bool query_has_key(const char *query_url, size_t query_len, const char *key) {

View File

@@ -408,7 +408,6 @@ AsyncWebParameter *AsyncWebServerRequest::getParam(const char *name) {
/// Search post_query then URL query with a callback.
/// Returns first truthy result, or value-initialized default.
/// Uses stack buffer for URL query to avoid heap allocation.
template<typename Func>
static auto search_query_sources(httpd_req_t *req, const std::string &post_query, const char *name, Func func)
-> decltype(func(nullptr, size_t{0}, name)) {