cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore a patch removed in previous commit

Browse Source
This commit is contained in:
giovanni 2020-08-10 15:17:11 +00:00
parent 6a3001aaeb
commit bf5c4cb25b
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/apache-httpd/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.105 2020/08/07 15:15:37 giovanni Exp $
# $OpenBSD: Makefile,v 1.106 2020/08/10 15:17:11 giovanni Exp $
COMMENT= apache HTTP server
V= 2.4.46
DISTNAME= httpd-${V}
PKGNAME= apache-httpd-${V}
REVISION= 0
CATEGORIES= www net

32
www/apache-httpd/patches/patch-modules_proxy_mod_proxy_uwsgi_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-modules_proxy_mod_proxy_uwsgi_c,v 1.3 2020/08/10 15:17:12 giovanni Exp $
Avoid NULL pointer dereferences for empty environment variable values
PR 64598
Index: modules/proxy/mod_proxy_uwsgi.c
--- modules/proxy/mod_proxy_uwsgi.c.orig
+++ modules/proxy/mod_proxy_uwsgi.c
@@ -175,7 +175,7 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
env = (apr_table_entry_t *) env_table->elts;
for (j = 0; j < env_table->nelts; ++j) {
- headerlen += 2 + strlen(env[j].key) + 2 + strlen(env[j].val);
+ headerlen += 2 + strlen(env[j].key) + 2 + (env[j].val ? strlen(env[j].val) : 0);
}
pktsize = headerlen - 4;
@@ -198,10 +198,12 @@ static int uwsgi_send_headers(request_rec *r, proxy_co
memcpy(ptr, env[j].key, keylen);
ptr += keylen;
- vallen = strlen(env[j].val);
+ vallen = env[j].val ? strlen(env[j].val) : 0;
*ptr++ = (apr_byte_t) (vallen & 0xff);
*ptr++ = (apr_byte_t) ((vallen >> 8) & 0xff);
- memcpy(ptr, env[j].val, vallen);
+ if (env[j].val) {
+ memcpy(ptr, env[j].val, vallen);
+ }
ptr += vallen;
}

4
www/apache-httpd/patches/patch-modules_ssl_ssl_engine_init_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-modules_ssl_ssl_engine_init_c,v 1.16 2020/03/31 14:30:33 sthen Exp $
$OpenBSD: patch-modules_ssl_ssl_engine_init_c,v 1.17 2020/08/10 15:17:12 giovanni Exp $
Index: modules/ssl/ssl_engine_init.c
--- modules/ssl/ssl_engine_init.c.orig
+++ modules/ssl/ssl_engine_init.c
@@ -1565,7 +1565,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s
@@ -1568,7 +1568,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s
X509_STORE_CTX *sctx;
X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);