From 5ec029c8835b71d7a3d6036c9358198b4d9e59fc Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 7 Jan 2021 02:06:16 +0100 Subject: argp: fix pointer-subtraction bug * argp/argp-help.c (hol_append): Don't subtract pointers to different arrays, as this can run afoul of -fcheck-pointer-bounds. See the thread containing Bruno Haible's report in: http://lists.gnu.org/archive/html/bug-gnulib/2017-05/msg00171.html Reviewed-by: Adhemerval Zanella --- argp/argp-help.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'argp') diff --git a/argp/argp-help.c b/argp/argp-help.c index 15c5fd237b..f417e1294c 100644 --- a/argp/argp-help.c +++ b/argp/argp-help.c @@ -867,7 +867,8 @@ hol_append (struct hol *hol, struct hol *more) /* Fix up the short options pointers from HOL. */ for (e = entries, left = hol->num_entries; left > 0; e++, left--) - e->short_options += (short_options - hol->short_options); + e->short_options + = short_options + (e->short_options - hol->short_options); /* Now add the short options from MORE, fixing up its entries too. */ -- cgit 1.4.1