summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/httpd/server_http.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/httpd/server_http.c b/usr.sbin/httpd/server_http.c
index 732add41283..6a74f3e45c5 100644
--- a/usr.sbin/httpd/server_http.c
+++ b/usr.sbin/httpd/server_http.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_http.c,v 1.143 2021/01/05 19:56:11 tb Exp $ */
+/* $OpenBSD: server_http.c,v 1.144 2021/10/21 11:48:30 benno Exp $ */
/*
* Copyright (c) 2020 Matthias Pressfreund <mpfr@fn.de>
@@ -268,8 +268,14 @@ server_read_http(struct bufferevent *bev, void *arg)
else if (*key == ' ' || *key == '\t')
/* Multiline headers wrap with a space or tab */
value = NULL;
- else
+ else {
+ /* Not a multiline header, should have a : */
value = strchr(key, ':');
+ if (value == NULL) {
+ server_abort_http(clt, 400, "malformed");
+ goto abort;
+ }
+ }
if (value == NULL) {
if (clt->clt_line == 1) {
server_abort_http(clt, 400, "malformed");