From: g. economou <8426352+isildur-g@users.noreply.github.com>
Date: Thu, 16 May 2024 06:57:58 +0000 (+0300)
Subject: Merge branch 'develop' into bugfix-rose-segfault
X-Git-Tag: vectorscan/5.4.12^2~39^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b03699fadeefea03d41c0593907833f88a25567b;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into bugfix-rose-segfault
---

b03699fadeefea03d41c0593907833f88a25567b
diff --cc src/rose/rose_build_bytecode.cpp
index 2be7dbcd,0c176e09..f7981729
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -2992,9 -2984,10 +2984,10 @@@ void buildFragmentPrograms(const RoseBu
                                                      pfrag.lit_ids);
          if (pfrag.included_delay_frag_id != INVALID_FRAG_ID &&
              !rebuild_prog.empty()) {
 -            const auto &cfrag = fragments[pfrag.included_frag_id];
 +            const auto &cfrag = fragments[pfrag.included_delay_frag_id];
-             assert(pfrag.s.length() >= cfrag.s.length() &&
-                    !pfrag.s.any_nocase() >= !cfrag.s.any_nocase());
+             /** assert(pfrag.s.length() >= cfrag.s.length() && **/
+             assert(pfrag.s.length() == cfrag.s.length() &&
+                    !pfrag.s.any_nocase() != !cfrag.s.any_nocase());
              u32 child_offset = cfrag.delay_program_offset;
              DEBUG_PRINTF("child %u offset %u\n", cfrag.fragment_id,
                           child_offset);