openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-18 19:24:43 +00:00
Code Issues Projects Releases Wiki Activity

relayd: error check bsearch in relay_httperror_byid()

Browse Source 
If relay_httperror_byid() is passed a HTTP error code not in the table
this would result in a NULL deref. The intent is that the code fall back
to "Unknown error" on NULL return.

From Jan Schreiber
This commit is contained in:
tb
2026-04-02 13:35:36 +00:00
parent 97281f0902
commit 6515c4104f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/relayd/relay_http.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: relay_http.c,v 1.95 2026/04/02 13:28:22 tb Exp $ */
/* $OpenBSD: relay_http.c,v 1.96 2026/04/02 13:35:36 tb Exp $ */
/*
* Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -1388,11 +1388,12 @@ relay_httperror_byid(u_int id)
/* Set up key */
error.error_code = (int)id;
res = bsearch(&error, http_errors,
if ((res = bsearch(&error, http_errors,
sizeof(http_errors) / sizeof(http_errors[0]) - 1,
sizeof(http_errors[0]), relay_httperror_cmp);
sizeof(http_errors[0]), relay_httperror_cmp)) != NULL)
return (res->error_name);
return (res->error_name);
return (NULL);
}
static int