Merge pull request #61 from hostilefork/fix-mem-errors

two memcpy to memmove changes, fix use of uninitialized err value
rebol · Jan 22, 2013 · 374dedf · 374dedf
2 parents 90c2fe8 + 27f6200
commit 374dedf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/core/c-do.c b/src/core/c-do.c
@@ -1813,7 +1813,8 @@ x*/	static REBINT Do_Args_Light(REBVAL *func, REBVAL *path, REBSER *block, REBCN
 
 	// Copy values to prior location:
 	inew--;
-	memcpy(DS_ARG(1), DS_TOP-(inew-1), inew * sizeof(REBVAL));
+	// memory areas may overlap, so use memmove and not memcpy!
+	memmove(DS_ARG(1), DS_TOP-(inew-1), inew * sizeof(REBVAL));
 	DSP = DS_ARG_BASE + inew; // new TOS
 	//Dump_Block(DS_ARG(1), inew);
 	VAL_WORD_FRAME(DSF_WORD(DSF)) = VAL_FUNC_BODY(func_val);

diff --git a/src/core/n-loop.c b/src/core/n-loop.c
@@ -417,6 +417,8 @@
 			if ((err = Check_Error(ds)) >= 0) break;
 			// else CONTINUE:
 			if (mode == 1) SET_FALSE(ds); // keep the value (for mode == 1)
+		} else {
+			err = 0; // prevent later test against uninitialized value
 		}
 
 		if (mode > 0) {
@@ -426,7 +428,8 @@
 			if (mode == 1) {  // remove-each
 				if (IS_FALSE(ds)) {
 					REBCNT wide = SERIES_WIDE(series);
-					memcpy(series->data + (windex * wide), series->data + (rindex * wide), (index - rindex) * wide);
+					// memory areas may overlap, so use memmove and not memcpy!
+					memmove(series->data + (windex * wide), series->data + (rindex * wide), (index - rindex) * wide);
 					windex += index - rindex;
 					// old: while (rindex < index) *BLK_SKIP(series, windex++) = *BLK_SKIP(series, rindex++);
 				}