FIX: better handling odd part values when using append/part on object! and map!

Author: Oldes

src/core/t-map.c

@@ -336,7 +336,8 @@
 	REBCNT n;
 
 	val = VAL_BLK_DATA(arg);
-	for (n = 0; n < len && NOT_END(val) && NOT_END(val+1); val += 2, n += 2) {
+	len >>= 1; // part must be number of key/value pairs
+	for (n = 0; n < len && NOT_END(val) && NOT_END(val+1); val += 2, n++) {
 		Find_Entry(ser, val, val+1, TRUE);
 	}
 }

src/core/t-object.c

@@ -101,8 +101,10 @@ static void Append_Obj(REBSER *obj, REBVAL *arg, REBCNT part)
 	// Setup binding table with obj words:
 	Collect_Object(obj);
 
+	part >>= 1; // part must be number of key/value pairs
+
 	// Examine word/value argument block
-	for (word = arg, n = 0; ++n < part && NOT_END(word); word += 2, n++) {
+	for (word = arg, n = 0; n < part && NOT_END(word); word += 2, n++) {
 
 		if (!IS_WORD(word) && !IS_SET_WORD(word)) {
 			// release binding table
@@ -138,7 +140,7 @@ static void Append_Obj(REBSER *obj, REBVAL *arg, REBCNT part)
 		Append_Frame(obj, 0, VAL_WORD_SYM(word));
 
 	// Set new values to obj words
-	for (word = arg, n = 0; ++n < part && NOT_END(word); word += 2, n++) {
+	for (word = arg, n = 0; n < part && NOT_END(word); word += 2, n++) {
 
 		i = binds[VAL_WORD_CANON(word)];
 		val = FRM_VALUE(obj, i);

src/tests/units/map-test.r3

@@ -84,9 +84,18 @@ Rebol [
 	--assert 2 = length? append/dup  m [c 3] 0
 	--assert 3 = length? append/dup  m [c 3] 1
 	--assert 4 = length? append/dup  m [d 4] 2
-	--assert 5 = length? append/part m [e 5 f 6] 1
+	--assert 4 = length? append/part m [e 5 f 6] 1 ;no-op!
+	--assert 5 = length? append/part m [e 5 f 6] 2
 	--assert [1 2 3 4 5] = values-of m
 
+	--test-- "append/part map! with odd part"
+	--assert []     == body-of append/part make map! [] [a 1 b 2 c 3] 1
+	--assert [a: 1] == body-of append/part make map! [] [a 1 b 2 c 3] 2
+	--assert [a: 1] == body-of append/part make map! [] [a 1 b 2 c 3] 3
+	--assert []     == body-of append/part make map! [] tail [a 1 b 2 c 3] -1
+	--assert [c: 3] == body-of append/part make map! [] tail [a 1 b 2 c 3] -2
+	--assert [2 c]  == body-of append/part make map! [] tail [a 1 b 2 c 3] -3 ;NOTE that it is not [c: 3] and its ok!
+
 ===end-group===