Date: Thu, 9 Apr 2020 17:57:58 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> 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 Message-ID: <202004091757.039HvwWF067760@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004091757.039HvwWF067760>