Fix segfault in Copy After

TinoDidriksen · TinoDidriksen · commit 00136aab86c6 · 2025-11-11T14:49:39.000+01:00
diff --git a/src/GrammarApplicator_runRules.cpp b/src/GrammarApplicator_runRules.cpp
@@ -2192,7 +2192,9 @@ uint32_t GrammarApplicator::runRulesOnSingleWindow(SingleWindow& current, const
 						}
 					}
 					if (rule->flags & RF_AFTER) {
-						std::advance(it, spot_tags->size());
+						for (size_t i = 0; it != cReading->tags_list.end() && i != spot_tags->size(); ++i) {
+							++it;
+						}
 					}
 					if (it != cReading->tags_list.end()) {
 						insert_taglist_to_reading(it, *theTags, *cReading, mappings);
diff --git a/src/version.hpp b/src/version.hpp
@@ -27,7 +27,7 @@ constexpr auto CG3_COPYRIGHT_STRING = "Copyright (C) 2007-2025 GrammarSoft ApS.
 
 constexpr uint32_t CG3_VERSION_MAJOR = 1;
 constexpr uint32_t CG3_VERSION_MINOR = 6;
-constexpr uint32_t CG3_VERSION_PATCH = 3;
+constexpr uint32_t CG3_VERSION_PATCH = 4;
 constexpr uint32_t CG3_REVISION = 13898;
 constexpr uint32_t CG3_FEATURE_REV = 13898;
 constexpr uint32_t CG3_TOO_OLD = 10373;

Original file line number	Diff line number	Diff line change
`@@ -2192,7 +2192,9 @@ uint32_t GrammarApplicator::runRulesOnSingleWindow(SingleWindow& current, const`
`2192`	`2192`	`}`
`2193`	`2193`	`}`
`2194`	`2194`	`if (rule->flags & RF_AFTER) {`
`2195`		`- std::advance(it, spot_tags->size());`
	`2195`	`+ for (size_t i = 0; it != cReading->tags_list.end() && i != spot_tags->size(); ++i) {`
	`2196`	`+ ++it;`
	`2197`	`+ }`
`2196`	`2198`	`}`
`2197`	`2199`	`if (it != cReading->tags_list.end()) {`
`2198`	`2200`	`insert_taglist_to_reading(it, theTags, cReading, mappings);`