From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Sun, 3 May 2020 17:31:30 +0000 (+0300)
Subject: argp-standalone: fix segfault in canon_doc_option
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3a79e3b18572d8932f44de43a232e349bf32f37d;p=openwrt%2Fstaging%2Frmilecki.git

argp-standalone: fix segfault in canon_doc_option

Backported from glibc.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

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 00000000000..46bffbb0a91
--- /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