Markdown: Modify replace_all to avoid infinite loop

geany · Mar 4, 2023 · a9914c7 · a9914c7
1 parent 2665511
commit a9914c7
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/markdown/src/viewer.c b/markdown/src/viewer.c
@@ -194,12 +194,15 @@ replace_all(MarkdownViewer *self,
 {
   gchar *ptr;
   gsize needle_len = strlen(needle);
+  gsize replacement_len = strlen(replacement);
+  goffset offset = 0;
 
   /* For each occurrence of needle in haystack */
-  while ((ptr = strstr(haystack->str, needle)) != NULL) {
-    goffset offset = ptr - haystack->str;
+  while ((ptr = strstr(haystack->str + offset, needle)) != NULL) {
+    offset = ptr - haystack->str;
     g_string_erase(haystack, offset, needle_len);
     g_string_insert(haystack, offset, replacement);
+    offset += replacement_len;
   }
 }