From 0e1761697d8ed24b07cf23035f5dd01d09056e3a Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 29 Aug 2021 18:53:55 +0300 Subject: Sync support with GNULIB updates. --- support/regex_internal.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'support/regex_internal.c') diff --git a/support/regex_internal.c b/support/regex_internal.c index 55f6b66d..aefcfa2f 100644 --- a/support/regex_internal.c +++ b/support/regex_internal.c @@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) if (__glibc_unlikely (dest->nelem == 0)) { + /* Although we already guaranteed above that dest->alloc != 0 and + therefore dest->elems != NULL, add a debug assertion to pacify + GCC 11.2.1's -fanalyzer. */ + DEBUG_ASSERT (dest->elems); dest->nelem = src->nelem; memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); return REG_NOERROR; @@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) if (__glibc_unlikely (set->nelem) == 0) { - /* We already guaranteed above that set->alloc != 0. */ + /* Although we already guaranteed above that set->alloc != 0 and + therefore set->elems != NULL, add a debug assertion to pacify + GCC 11.2 -fanalyzer. */ + DEBUG_ASSERT (set->elems); set->elems[0] = elem; ++set->nelem; return true; -- cgit v1.2.3