diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/Makefile | 3 | ||||
| -rw-r--r-- | posix/bug-regex4.c | 60 | ||||
| -rw-r--r-- | posix/regex.c | 8 |
3 files changed, 70 insertions, 1 deletions
diff --git a/posix/Makefile b/posix/Makefile index 12211fc84b..dab29f8cab 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -69,7 +69,8 @@ tests := tstgetopt testfnm runtests runptests \ tst-preadwrite tst-preadwrite64 test-vfork regexbug1 \ tst-getlogin tst-mmap tst-getaddrinfo tst-truncate \ tst-truncate64 tst-fork tst-fnmatch tst-regexloc tst-dir \ - tst-chmod bug-regex1 bug-regex2 bug-regex3 tst-gnuglob + tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \ + tst-gnuglob ifeq (yes,$(build-shared)) test-srcs := globtest tests += wordexp-test tst-exec tst-spawn diff --git a/posix/bug-regex4.c b/posix/bug-regex4.c new file mode 100644 index 0000000000..68da455c81 --- /dev/null +++ b/posix/bug-regex4.c @@ -0,0 +1,60 @@ +/* Test for re_search_2. + Copyright (C) 2001 Free Software Foundation, Inc. + Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <locale.h> +#include <stdio.h> +#include <string.h> +#include <regex.h> + +int +main (void) +{ + struct re_pattern_buffer regex; + const char *s; + int match[3]; + int result = 0; + + memset (®ex, '\0', sizeof (regex)); + + setlocale (LC_ALL, "C"); + + setlocale (LC_ALL, "C"); + s = re_compile_pattern ("ab[cde]", 7, ®ex); + if (s != NULL) + { + puts ("re_compile_pattern return non-NULL value"); + result = 1; + } + else + { + match[0] = re_search_2 (®ex, "xyabez", 6, "", 0, 1, 9, NULL, 10); + match[1] = re_search_2 (®ex, NULL, 0, "abc", 3, 0, 3, NULL, 3); + match[2] = re_search_2 (®ex, "xya", 3, "bd", 2, 2, 6, NULL, 8); + if (match[0] != 2 || match[1] != 0 || match[2] != 2) + { + printf ("re_match returned %d,%d,%d, expected 2,0,2\n", + match[0], match[1], match[2]); + result = 1; + } + else + puts (" -> OK"); + } + + return result; +} diff --git a/posix/regex.c b/posix/regex.c index 471d869899..ca4645945e 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -5595,6 +5595,12 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) size2 = size1; string1 = 0; size1 = 0; +#ifdef MBS_SUPPORT + mbs_offset2 = mbs_offset1; + csize2 = csize1; + mbs_offset1 = NULL; + csize1 = 0; +#endif } end1 = string1 + size1; end2 = string2 + size2; @@ -5609,6 +5615,8 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop) } else { + if (stop > csize1 + csize2) + stop = csize1 + csize2; end_match_1 = end1; mcnt = count_mbs_length(mbs_offset2, stop-csize1); end_match_2 = string2 + mcnt; |