summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2022-12-06 19:53:15 -0500
committerFlorin Coras <florin.coras@gmail.com>2022-12-07 04:01:11 +0000
commit287c1252c1c2ed5e3153f3dfab530456edfa9322 (patch)
treea31ed9d1f588ea6639fc6e26c5c424350cfcdf78
parentbd9cde810b9aa0a9ee59d10aee91bc313318f042 (diff)
http_static: misc bug fixes
The request vector generated by hss_ts_rx_callback() must be NULL terminated. The hss_main_t use_ptr_thresh member must be a u64 since unformat_memory_size() expects it. Otherwise, the adjacent u8 enable_url_handlers may have an accident. Type: fix Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I2cc08e3cbd31b225fb03799283c055515add13bf
-rw-r--r--src/plugins/http_static/http_static.h2
-rw-r--r--src/plugins/http_static/static_server.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/http_static/http_static.h b/src/plugins/http_static/http_static.h
index 4e038ed385d..5ea1a6eab8f 100644
--- a/src/plugins/http_static/http_static.h
+++ b/src/plugins/http_static/http_static.h
@@ -145,7 +145,7 @@ typedef struct
/** The bind URI, defaults to tcp://0.0.0.0/80 */
u8 *uri;
/** Threshold for switching to ptr data in http msgs */
- u32 use_ptr_thresh;
+ u64 use_ptr_thresh;
/** Enable the use of builtinurls */
u8 enable_url_handlers;
/** Max cache size before LRU occurs */
diff --git a/src/plugins/http_static/static_server.c b/src/plugins/http_static/static_server.c
index a4c62fcda07..a76cb87a2ce 100644
--- a/src/plugins/http_static/static_server.c
+++ b/src/plugins/http_static/static_server.c
@@ -384,6 +384,8 @@ hss_ts_rx_callback (session_t *ts)
vec_validate (request, msg.data.len - 1);
rv = svm_fifo_dequeue (ts->rx_fifo, msg.data.len, request);
ASSERT (rv == msg.data.len);
+ /* request must be a proper C-string in addition to a vector */
+ vec_add1 (request, 0);
}
/* Find and send data */