From owner-svn-ports-head@freebsd.org Tue Apr 17 09:35:09 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0273F93A88; Tue, 17 Apr 2018 09:35:09 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 365BA758FD; Tue, 17 Apr 2018 09:35:09 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 311A428BC; Tue, 17 Apr 2018 09:35:09 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3H9Z9oF024387; Tue, 17 Apr 2018 09:35:09 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3H9Z8Zd024385; Tue, 17 Apr 2018 09:35:08 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201804170935.w3H9Z8Zd024385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Tue, 17 Apr 2018 09:35:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467590 - in head/net/haproxy-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head/net/haproxy-devel: . files X-SVN-Commit-Revision: 467590 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Apr 2018 09:35:09 -0000 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;