From owner-svn-ports-all@freebsd.org Mon May 16 02:25:42 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 247F8B3C27E; Mon, 16 May 2016 02:25:42 +0000 (UTC) (envelope-from vanilla@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 mx1.freebsd.org (Postfix) with ESMTPS id CBDCC1AF8; Mon, 16 May 2016 02:25:41 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G2PefA086128; Mon, 16 May 2016 02:25:40 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G2PePw086125; Mon, 16 May 2016 02:25:40 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201605160225.u4G2PePw086125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Mon, 16 May 2016 02:25:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415303 - in head/devel/jansson: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2016 02:25:42 -0000 Author: vanilla Date: Mon May 16 02:25:40 2016 New Revision: 415303 URL: https://svnweb.freebsd.org/changeset/ports/415303 Log: Fix issue to parse large flat json files. PR: 209492 Reported by: yuri@rawbw.com Modified: head/devel/jansson/Makefile head/devel/jansson/files/patch-CVE-2016-4425 Modified: head/devel/jansson/Makefile ============================================================================== --- head/devel/jansson/Makefile Mon May 16 02:17:34 2016 (r415302) +++ head/devel/jansson/Makefile Mon May 16 02:25:40 2016 (r415303) @@ -3,7 +3,7 @@ PORTNAME= jansson PORTVERSION= 2.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.digip.org/jansson/releases/ Modified: head/devel/jansson/files/patch-CVE-2016-4425 ============================================================================== --- head/devel/jansson/files/patch-CVE-2016-4425 Mon May 16 02:17:34 2016 (r415302) +++ head/devel/jansson/files/patch-CVE-2016-4425 Mon May 16 02:25:40 2016 (r415303) @@ -1,16 +1,16 @@ ---- src/jansson_config.h.in.orig 2016-05-04 11:43:48.386196000 +0800 -+++ src/jansson_config.h.in 2016-05-04 11:44:21.204996000 +0800 +--- src/jansson_config.h.in.orig 2016-05-16 10:22:34.333432000 +0800 ++++ src/jansson_config.h.in 2016-05-16 10:23:18.042096000 +0800 @@ -36,4 +36,8 @@ otherwise to 0. */ #define JSON_HAVE_LOCALECONV @json_have_localeconv@ +/* Maximum recursion depth for parsing JSON input. -+ * This limits the depth of e.g. array-within-array constructions. */ ++ This limits the depth of e.g. array-within-array constructions. */ +#define JSON_PARSER_MAX_DEPTH 2048 + #endif ---- src/load.c.orig 2016-05-04 11:44:34.356957000 +0800 -+++ src/load.c 2016-05-04 11:46:44.547307000 +0800 +--- src/load.c.orig 2014-10-02 12:59:26.000000000 +0800 ++++ src/load.c 2016-05-16 10:21:41.006239000 +0800 @@ -61,6 +61,7 @@ typedef struct { typedef struct { stream_t stream; @@ -32,7 +32,15 @@ switch(lex->token) { case TOKEN_STRING: { const char *value = lex->value.string.val; -@@ -877,6 +884,8 @@ static json_t *parse_json(lex_t *lex, si +@@ -870,6 +877,7 @@ static json_t *parse_value(lex_t *lex, s + if(!json) + return NULL; + ++ lex->depth--; + return json; + } + +@@ -877,6 +885,8 @@ static json_t *parse_json(lex_t *lex, si { json_t *result;