svn commit: r467590 - in head/net/haproxy-devel: . files
Dmitry Sivachenko
demon at FreeBSD.org
Tue Apr 17 09:35:09 UTC 2018
Author: demon
Date: Tue Apr 17 09:35:08 2018
New Revision: 467590
URL: https://svnweb.freebsd.org/changeset/ports/467590
Log:
Fix crash under some conditions.
Obtained from: upstream
Added:
head/net/haproxy-devel/files/patch-src-mux_h2.c (contents, props changed)
Modified:
head/net/haproxy-devel/Makefile
Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile Tue Apr 17 09:33:40 2018 (r467589)
+++ head/net/haproxy-devel/Makefile Tue Apr 17 09:35:08 2018 (r467590)
@@ -3,6 +3,7 @@
PORTNAME= haproxy
DISTVERSION= 1.8.7
+PORTREVISION= 1
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/1.8/src/
PKGNAMESUFFIX= -devel
Added: head/net/haproxy-devel/files/patch-src-mux_h2.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/haproxy-devel/files/patch-src-mux_h2.c Tue Apr 17 09:35:08 2018 (r467590)
@@ -0,0 +1,20 @@
+--- src/mux_h2.c
++++ src/mux_h2.c
+@@ -1735,7 +1735,7 @@ static void h2_process_demux(struct h2c *h2c)
+ goto fail;
+ }
+
+- if ((int)hdr.len < 0 || (int)hdr.len > h2c->mfs) {
++ if ((int)hdr.len < 0 || (int)hdr.len > global.tune.bufsize) {
+ /* RFC7540#3.5: a GOAWAY frame MAY be omitted */
+ h2c_error(h2c, H2_ERR_FRAME_SIZE_ERROR);
+ h2c->st0 = H2_CS_ERROR2;
+@@ -1765,7 +1765,7 @@ static void h2_process_demux(struct h2c *h2c)
+ if (!h2_peek_frame_hdr(h2c->dbuf, &hdr))
+ break;
+
+- if ((int)hdr.len < 0 || (int)hdr.len > h2c->mfs) {
++ if ((int)hdr.len < 0 || (int)hdr.len > global.tune.bufsize) {
+ h2c_error(h2c, H2_ERR_FRAME_SIZE_ERROR);
+ h2c->st0 = H2_CS_ERROR;
+ break;
More information about the svn-ports-all
mailing list