fix #486 problem in AVX2 SIMD

fix problem in AVX2 SIMD acceleration code for certain patterns, where SSE2 code is fine

Author: genivia-inc

bin/win32/ug.exe

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for ugrep 7.4.0.
+# Generated by GNU Autoconf 2.72 for ugrep 7.4.1.
 #
 # Report bugs to <https://github.com/Genivia/ugrep/issues>.
 #
@@ -606,8 +606,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ugrep'
 PACKAGE_TARNAME='ugrep'
-PACKAGE_VERSION='7.4.0'
-PACKAGE_STRING='ugrep 7.4.0'
+PACKAGE_VERSION='7.4.1'
+PACKAGE_STRING='ugrep 7.4.1'
 PACKAGE_BUGREPORT='https://github.com/Genivia/ugrep/issues'
 PACKAGE_URL='https://ugrep.com'
 
@@ -1382,7 +1382,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures ugrep 7.4.0 to adapt to many kinds of systems.
+'configure' configures ugrep 7.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1453,7 +1453,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ugrep 7.4.0:";;
+     short | recursive ) echo "Configuration of ugrep 7.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1630,7 +1630,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ugrep configure 7.4.0
+ugrep configure 7.4.1
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2184,7 +2184,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ugrep $as_me 7.4.0, which was
+It was created by ugrep $as_me 7.4.1, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3694,7 +3694,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ugrep'
- VERSION='7.4.0'
+ VERSION='7.4.1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -11808,7 +11808,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ugrep $as_me 7.4.0, which was
+This file was extended by ugrep $as_me 7.4.1, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11881,7 +11881,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-ugrep config.status 7.4.0
+ugrep config.status 7.4.1
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

bin/win32/ugrep-indexer.exe

@@ -1,4 +1,4 @@
-AC_INIT([ugrep],[7.4.0],[https://github.com/Genivia/ugrep/issues],[ugrep],[https://ugrep.com])
+AC_INIT([ugrep],[7.4.1],[https://github.com/Genivia/ugrep/issues],[ugrep],[https://ugrep.com])
 AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip])
 AC_CONFIG_HEADERS([config.h])
 AC_COPYRIGHT([Copyright (C) 2019-2025 Robert van Engelen, Genivia Inc.])

bin/win32/ugrep.exe

@@ -232,7 +232,8 @@ bool Matcher::simd_advance_pattern_pin1_pma_avx2(size_t loc)
     }
     else
     {
-      loc = std::max<size_t>(loc, e - lcp - buf_);
+      if (e > buf_ + loc + lcp)
+        loc = e - buf_ - lcp;
       set_current_and_peek_more(loc);
       loc = cur_;
       if (loc + min > end_ && eof_)
@@ -288,7 +289,8 @@ bool Matcher::simd_advance_pattern_pin1_pmh_avx2(size_t loc)
     }
     else
     {
-      loc = std::max<size_t>(loc, e - lcp - buf_);
+      if (e > buf_ + loc + lcp)
+        loc = e - buf_ - lcp;
       set_current_and_peek_more(loc);
       loc = cur_;
       if (loc + MIN > end_ && eof_)

bin/win64/ug.exe

@@ -1,4 +1,4 @@
-.TH UGREP "1" "April 21, 2025" "ugrep 7.4.0" "User Commands"
+.TH UGREP "1" "April 24, 2025" "ugrep 7.4.1" "User Commands"
 .SH NAME
 \fBugrep\fR, \fBug\fR -- file pattern searcher
 .SH SYNOPSIS