From owner-svn-ports-head@freebsd.org Thu Apr 9 17:57:58 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A614C278F2B; Thu, 9 Apr 2020 17:57:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48yplV3x27z3xkx; Thu, 9 Apr 2020 17:57:58 +0000 (UTC) (envelope-from hselasky@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 8211F18BFF; Thu, 9 Apr 2020 17:57:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 039HvwNo067764; Thu, 9 Apr 2020 17:57:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 039HvwWF067760; Thu, 9 Apr 2020 17:57:58 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202004091757.039HvwWF067760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 9 Apr 2020 17:57:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531220 - in head/devel/argp-standalone: . files X-SVN-Group: ports-head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/devel/argp-standalone: . files X-SVN-Commit-Revision: 531220 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.29 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: Thu, 09 Apr 2020 17:57:58 -0000 Author: hselasky Date: Thu Apr 9 17:57:57 2020 New Revision: 531220 URL: https://svnweb.freebsd.org/changeset/ports/531220 Log: Fix segmentation fault when showing help text. Found when running dvbv5-scan (part of coming v4l-utils upgrade). Backtrace: #0 hol_entry_help (entry=0x8007e0000, state=0x0, stream=0x8007d3000, hhstate=0x7fffffffe5d8) at argp-help.c:1164 #1 hol_help (hol=0x8007df000, state=0x0, stream=0x8007d3000) at argp-help.c:1230 #2 _help (argp=0x7fffffffe750, state=0x0, stream=0x8004fca20, flags=634, name=0x2018ce "dvbv5-scan") at argp-help.c:1675 #3 argp_help (argp=0x7fffffffe750, stream=0x8004fca20, flags=634, name=0x2018ce "dvbv5-scan") at argp-help.c:1707 Upstream maintainer has been notified. Approved by: pi (implicit) Added: head/devel/argp-standalone/files/patch-argp-help.c (contents, props changed) Modified: head/devel/argp-standalone/Makefile Modified: head/devel/argp-standalone/Makefile ============================================================================== --- head/devel/argp-standalone/Makefile Thu Apr 9 17:56:52 2020 (r531219) +++ head/devel/argp-standalone/Makefile Thu Apr 9 17:57:57 2020 (r531220) @@ -3,7 +3,7 @@ PORTNAME= argp-standalone PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \ LOCAL/sem Added: head/devel/argp-standalone/files/patch-argp-help.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/argp-standalone/files/patch-argp-help.c Thu Apr 9 17:57:57 2020 (r531220) @@ -0,0 +1,14 @@ +--- argp-help.c.orig 2020-04-09 17:39:48 UTC ++++ argp-help.c +@@ -1704,7 +1704,10 @@ Try `%s --help' or `%s --usage' for more information.\ + void __argp_help (const struct argp *argp, FILE *stream, + unsigned flags, char *name) + { +- _help (argp, 0, stream, flags, name); ++ struct argp_state state = { ++ .root_argp = argp, ++ }; ++ _help (argp, &state, stream, flags, name); + } + #ifdef weak_alias + weak_alias (__argp_help, argp_help)