add incomplete pattern text

Author: perazz

project/fortran-regex.depend

@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1671275921 source:/Users/federico/code/fortran-regex/src/regex.f90
+1671299845 source:/Users/federico/code/fortran-regex/src/regex.f90
 
 1671276031 source:/Users/federico/code/fortran-regex/test/test_1.f90
 

src/regex.f90

@@ -474,9 +474,9 @@ subroutine new_from_pattern(this,pattern)
 
                     i = i+1 ! Increment i to avoid including "^" in the char-buffer
 
-                    ! Check this is not an incomplete pattern
+                    ! incomplete pattern
                     if (i>=lenp) then
-                        stop 'incomplete pattern'
+                        call this%destroy()
                         return
                     end if
 
@@ -491,17 +491,23 @@ subroutine new_from_pattern(this,pattern)
                     i = i+loc
                     if (DEBUG) print "('[regex] at end of multi-character pattern: ',a)", trim(ccl_buf)
                 else
-                    stop 'incomplete [] pattern'
+                    ! Incomplete [] pattern
+                    call this%destroy()
+                    return
                 end if
 
                 ! If there is any escape character(s), just check that the next is nonempty
                 loc = index(ccl_buf,'\')
                 if (loc>0) then
                     if (loc>=len(ccl_buf)) then
-                        stop 'incomplete escaped character inside [] pattern'
+                        ! stop 'incomplete escaped character inside [] pattern'
+                        call this%destroy()
+                        return
                     end if
                     if (ccl_buf(loc+1:loc+1)==SPACE) then
-                        stop 'empty escaped character inside [] pattern'
+                        ! stop 'empty escaped character inside [] pattern'
+                        call this%destroy()
+                        return
                     end if
                 end if
 
@@ -526,6 +532,7 @@ subroutine new_from_pattern(this,pattern)
 
        ! Save number of patterns
        this%n = j-1
+       return
 
     end subroutine new_from_pattern
 

test/tests.f90

@@ -22,6 +22,17 @@ program tests
     ! Test #2
     call add_test(run_test2())
 
+    ! Test #3
+    call add_test(test_invalid())
+
+    if (nfailed<=0) then
+        print *, 'SUCCESS! all tests passed.'
+        stop 0
+    else
+        print *, 'ERROR: ',nfailed,' tests failed, ',npassed,' passed.'
+        stop 1
+    end if
+
 
 
 
@@ -36,6 +47,21 @@ subroutine add_test(successful_test)
         end if
     end subroutine add_test
 
+    ! Test two bug patterns reported by @DavidKorczynski in https://github.com/kokke/tiny-regex-c/issues/44
+    logical function test_invalid() result(success)
+
+       type(regex_op) :: re
+
+       ! Test 1: inverted set without a closing ']'
+       re = parse_pattern("\\\x01[^\\\xff][^")
+       success = re%n==0; if (.not.success) return
+
+       ! Test 1: inverted set without a closing ']'
+       re = parse_pattern("\\\x01[^\\\xff][\\")
+       success = re%n==0; if (.not.success) return
+
+    end function test_invalid
+