mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
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)
This commit is contained in:
parent
2fd7bc0313
commit
61a298ef1e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=531220
2 changed files with 15 additions and 1 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PORTNAME= argp-standalone
|
PORTNAME= argp-standalone
|
||||||
PORTVERSION= 1.3
|
PORTVERSION= 1.3
|
||||||
PORTREVISION= 3
|
PORTREVISION= 4
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \
|
MASTER_SITES= http://www.lysator.liu.se/~nisse/misc/ \
|
||||||
LOCAL/sem
|
LOCAL/sem
|
||||||
|
|
14
devel/argp-standalone/files/patch-argp-help.c
Normal file
14
devel/argp-standalone/files/patch-argp-help.c
Normal file
|
@ -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)
|
Loading…
Add table
Reference in a new issue