summaryrefslogtreecommitdiffstats
path: root/gl/regexec.c
diff options
context:
space:
mode:
authorLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2024-11-10 00:06:06 +0100
committerLorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>2024-11-10 00:06:06 +0100
commit21c39515903c34bc6428a544c88cf1c100786847 (patch)
treec9d0465e24cc3148c84c2fee191f2b1bfc71b841 /gl/regexec.c
parented01d534474cc640515f1d5155349f14090aafe9 (diff)
parent5d7d620903a2fb40f8cd3140081bfb7ceaf125d5 (diff)
downloadmonitoring-plugins-21c39515903c34bc6428a544c88cf1c100786847.tar.gz
Merge branch 'master' into check_swap_again
Diffstat (limited to 'gl/regexec.c')
-rw-r--r--gl/regexec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gl/regexec.c b/gl/regexec.c
index 13e0349e..9f065dfa 100644
--- a/gl/regexec.c
+++ b/gl/regexec.c
@@ -1,5 +1,5 @@
1/* Extended regular expression matching and search library. 1/* Extended regular expression matching and search library.
2 Copyright (C) 2002-2023 Free Software Foundation, Inc. 2 Copyright (C) 2002-2024 Free Software Foundation, Inc.
3 This file is part of the GNU C Library. 3 This file is part of the GNU C Library.
4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. 4 Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
5 5
@@ -324,7 +324,7 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
324 char *s = NULL; 324 char *s = NULL;
325 325
326 if (__glibc_unlikely ((length1 < 0 || length2 < 0 || stop < 0 326 if (__glibc_unlikely ((length1 < 0 || length2 < 0 || stop < 0
327 || INT_ADD_WRAPV (length1, length2, &len)))) 327 || ckd_add (&len, length1, length2))))
328 return -2; 328 return -2;
329 329
330 /* Concatenate the strings. */ 330 /* Concatenate the strings. */