fix #305: e() function bug

kkos · Jul 1, 2024 · ec9d8c8 · ec9d8c8
1 parent ab444e0
commit ec9d8c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/test/test_back.c b/test/test_back.c
@@ -1,6 +1,6 @@
 /*
  * test_back.c
- * Copyright (c) 2020-2021  K.Kosako
+ * Copyright (c) 2020-2024  K.Kosako
  */
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION
@@ -64,7 +64,7 @@ static void xx(char* pattern, char* str, int from, int to, int mem, int not,
   r = onig_search(reg, (UChar* )str, (UChar* )(str + SLEN(str)),
                   (UChar* )(str + SLEN(str)), (UChar* )str,
                   region, ONIG_OPTION_NONE);
-  if (r < ONIG_MISMATCH) {
+  if (r < ONIG_MISMATCH || error_no < ONIG_MISMATCH) {
     char s[ONIG_MAX_ERROR_MESSAGE_LEN];
 
     if (error_no == 0) {

diff --git a/test/test_options.c b/test/test_options.c
@@ -1,6 +1,6 @@
 /*
  * test_options.c
- * Copyright (c) 2020-2021  K.Kosako
+ * Copyright (c) 2020-2024  K.Kosako
  */
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION
@@ -64,7 +64,7 @@ static void xx(OnigOptionType options, char* pattern, char* str,
   r = onig_search(reg, (UChar* )str, (UChar* )(str + SLEN(str)),
                   (UChar* )str, (UChar* )(str + SLEN(str)),
                   region, options);
-  if (r < ONIG_MISMATCH) {
+  if (r < ONIG_MISMATCH || error_no < ONIG_MISMATCH) {
     char s[ONIG_MAX_ERROR_MESSAGE_LEN];
 
     if (error_no == 0) {

diff --git a/test/test_syntax.c b/test/test_syntax.c
@@ -65,7 +65,7 @@ static void xx(char* pattern, char* str, int from, int to, int mem, int not,
   r = onig_search(reg, (UChar* )str, (UChar* )(str + SLEN(str)),
                   (UChar* )str, (UChar* )(str + SLEN(str)),
                   region, ONIG_OPTION_NONE);
-  if (r < ONIG_MISMATCH) {
+  if (r < ONIG_MISMATCH || error_no < ONIG_MISMATCH) {
     char s[ONIG_MAX_ERROR_MESSAGE_LEN];
 
     if (error_no == 0) {

diff --git a/test/test_utf8.c b/test/test_utf8.c
@@ -64,7 +64,7 @@ static void xx(char* pattern, char* str, int from, int to, int mem, int not,
   r = onig_search(reg, (UChar* )str, (UChar* )(str + SLEN(str)),
                   (UChar* )str, (UChar* )(str + SLEN(str)),
                   region, ONIG_OPTION_NONE);
-  if (r < ONIG_MISMATCH) {
+  if (r < ONIG_MISMATCH || error_no < ONIG_MISMATCH) {
     char s[ONIG_MAX_ERROR_MESSAGE_LEN];
 
     if (error_no == 0) {
@@ -1648,8 +1648,8 @@ extern int main(int argc, char* argv[])
   e("()(?Ii)", "", ONIGERR_INVALID_GROUP_OPTION);
   e("(?:)(?Ii)", "", ONIGERR_INVALID_GROUP_OPTION);
   e("^(?Ii)", "", ONIGERR_INVALID_GROUP_OPTION);
-  e("(?Ii)$", "", ONIGERR_INVALID_GROUP_OPTION);
-  e("(?Ii)|", "", ONIGERR_INVALID_GROUP_OPTION);
+  x2("(?Ii)$", "", 0, 0);
+  x2("(?Ii)|", "", 0, 0);
   e("(?Ii)|(?Ii)", "", ONIGERR_INVALID_GROUP_OPTION);
   x2("a*", "aabcaaa", 0, 2);
   x2("(?L)a*", "aabcaaa", 4, 7);