Fix overlapping memcpy in APPEND_LIST

gap-system · Feb 13, 2019 · 67e51c0 · 67e51c0
1 parent 7f93980
commit 67e51c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/listfunc.c b/src/listfunc.c
@@ -288,7 +288,8 @@ Obj             FuncAPPEND_LIST_INTR (
         SET_LEN_STRING(list1, len1 + len2);
         CLEAR_FILTS_LIST(list1);
         // copy data, including terminating zero byte
-        memcpy(CHARS_STRING(list1) + len1, CHARS_STRING(list2), len2 + 1);
+        // Can't use memcpy, in case list1 == list2
+        SyMemmove(CHARS_STRING(list1) + len1, CHARS_STRING(list2), len2 + 1);
         return (Obj) 0;
     }
 

diff --git a/tst/testinstall/listindex.tst b/tst/testinstall/listindex.tst
@@ -183,6 +183,20 @@ gap> l := "cheese";; Append(l, [true]); l;
 [ 'c', 'h', 'e', 'e', 's', 'e', true ]
 gap> l := "cheese";; Append(l, []); l;
 "cheese"
+gap> Append(l, l); l;
+"cheesecheese"
+gap> l := "chee";; Append(l, l); l;
+"cheechee"
+gap> l := "cheeseXX";; Append(l, l); l;
+"cheeseXXcheeseXX"
+gap> l := [true];; Append(l, l); l;
+[ true, true ]
+gap> Append(l,l); l;
+[ true, true, true, true ]
+gap> l := [];; Append(l,l); l;
+[  ]
+gap> l := [1,2,3,4];; Append(l,l); l;
+[ 1, 2, 3, 4, 1, 2, 3, 4 ]
 gap> Append(Immutable([1,2,3]), [1,2,3]);
 Error, Append: <list1> must be a mutable list
 gap> Append([1,2,3], () );