aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2020-05-03 20:31:30 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2020-05-03 20:31:30 +0300
commit3a79e3b18572d8932f44de43a232e349bf32f37d (patch)
tree958647e95950dec83eeadfc4bb715e4248690a41 /package
parent49ab97ca86593de1bcb16c70e58e3cb62c16623d (diff)
downloadupstream-3a79e3b18572d8932f44de43a232e349bf32f37d.tar.gz
upstream-3a79e3b18572d8932f44de43a232e349bf32f37d.tar.bz2
upstream-3a79e3b18572d8932f44de43a232e349bf32f37d.zip
argp-standalone: fix segfault in canon_doc_option
Backported from glibc. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'package')
-rw-r--r--package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch b/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch
new file mode 100644
index 0000000000..46bffbb0a9
--- /dev/null
+++ b/package/libs/argp-standalone/patches/900-fix-segfault-in_canon_doc_option.patch
@@ -0,0 +1,14 @@
+--- a/argp-help.c
++++ b/argp-help.c
+@@ -777,9 +777,9 @@ hol_entry_cmp (const struct hol_entry *e
+ const char *long2 = hol_entry_first_long (entry2);
+
+ if (doc1)
+- doc1 = canon_doc_option (&long1);
++ doc1 = long1 != NULL && canon_doc_option (&long1);
+ if (doc2)
+- doc2 = canon_doc_option (&long2);
++ doc2 = long2 != NULL && canon_doc_option (&long2);
+
+ if (doc1 != doc2)
+ /* `documentation' options always follow normal options (or