]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
Merge branch 'develop' into bugfix-rose-segfault 280/head
authorg. economou <8426352+isildur-g@users.noreply.github.com>
Thu, 16 May 2024 06:57:58 +0000 (09:57 +0300)
committerGitHub <noreply@github.com>
Thu, 16 May 2024 06:57:58 +0000 (09:57 +0300)
1  2 
src/rose/rose_build_bytecode.cpp

index 2be7dbcdda18ba0f75c3b9d0be32098f29012a1f,0c176e09f0113860cea6dd4c0f431b604d85b3f9..f79817299e726723dadc99f56127b68124eadecd
@@@ -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);