diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2020-04-09 17:57:57 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2020-04-09 17:57:57 +0000 |
| commit | 61a298ef1e47b60199c8e30f81be9b9ba29b8a1d (patch) | |
| tree | fc3f5d63848d9469c65d0d27f963037a0896a37e /devel/argp-standalone | |
| parent | devel/godot: fix pkg-descr (diff) | |
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)
Diffstat (limited to 'devel/argp-standalone')
| -rw-r--r-- | devel/argp-standalone/Makefile | 2 | ||||
| -rw-r--r-- | devel/argp-standalone/files/patch-argp-help.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile index 044d32015868..200d033635b6 100644 --- a/devel/argp-standalone/Makefile +++ b/devel/argp-standalone/Makefile @@ -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 diff --git a/devel/argp-standalone/files/patch-argp-help.c b/devel/argp-standalone/files/patch-argp-help.c new file mode 100644 index 000000000000..4074bef9f85b --- /dev/null +++ b/devel/argp-standalone/files/patch-argp-help.c @@ -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) |