[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/11] Make gnulib's regcomp not abort()
From: |
Robbie Harwood |
Subject: |
[PATCH 06/11] Make gnulib's regcomp not abort() |
Date: |
Mon, 25 Oct 2021 17:55:39 -0400 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
[rharwood@redhat.com: we wrote a commit message]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
lib/regcomp.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/regcomp.c b/lib/regcomp.c
index 887e5b506..4a106ff59 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -528,9 +528,9 @@ regerror (int errcode, const regex_t *__restrict preg, char
*__restrict errbuf,
to this routine. If we are given anything else, or if other regex
code generates an invalid error code, then the program has a bug.
Dump core so we can fix it. */
- abort ();
-
- msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
+ msg = gettext ("unknown regexp error");
+ else
+ msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
msg_size = strlen (msg) + 1; /* Includes the null. */
@@ -1136,7 +1136,7 @@ optimize_utf8 (re_dfa_t *dfa)
}
break;
default:
- abort ();
+ break;
}
if (mb_chars || has_period)
--
2.33.0
- [PATCH 00/11] Code hygiene fixes from grub, Robbie Harwood, 2021/10/25
- [PATCH 08/11] Fix __argp_fmtstream_point()'s return type and comparisons with it, Robbie Harwood, 2021/10/25
- [PATCH 07/11] Make CFLAGS less painful, Robbie Harwood, 2021/10/25
- [PATCH 02/11] argp-parse.c (__argp_input): Don't crash if pstate is NULL, Robbie Harwood, 2021/10/25
- [PATCH 05/11] Fix width computation, Robbie Harwood, 2021/10/25
- [PATCH 01/11] Fix base64 module to work with grub codebase, Robbie Harwood, 2021/10/25
- [PATCH 06/11] Make gnulib's regcomp not abort(),
Robbie Harwood <=
- [PATCH 03/11] gnulib/regexec: Fix possible null-dereference, Robbie Harwood, 2021/10/25
- [PATCH 11/11] Fixup for -Werror=ignored-qualifiers issues, Robbie Harwood, 2021/10/25
- [PATCH 04/11] gnulib/regexec: Resolve unused variable, Robbie Harwood, 2021/10/25
- [PATCH 09/11] Fix up a bunch of "gcc -Werror=sign-compare" complaints, Robbie Harwood, 2021/10/25
- [PATCH 10/11] Paper over a stringop-overflow warning about wide char handling, Robbie Harwood, 2021/10/25