* array.c (rb_ary_resize): should care of embeded array when extending

unak · unak · commit c480ca0f131a · 2011-01-11T04:09:02.000Z
the array.

* array.c (rb_ary_resize): need to set capa when changing the real
  size of the array.
  these are latent bugs.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan 11 13:06:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* array.c (rb_ary_resize): should care of embeded array when extending
+	  the array.
+
+	* array.c (rb_ary_resize): need to set capa when changing the real
+	  size of the array.
+	  these are latent bugs.
+
 Mon Jan 10 22:46:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case
diff --git a/array.c b/array.c
@@ -1332,7 +1332,7 @@ rb_ary_resize(VALUE ary, long len)
 	    ary_double_capa(ary, len);
 	}
 	rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen);
-        ARY_SET_HEAP_LEN(ary, len);
+        ARY_SET_LEN(ary, len);
     }
     else if (ARY_EMBED_P(ary)) {
         ARY_SET_EMBED_LEN(ary, len);
@@ -1347,6 +1347,7 @@ rb_ary_resize(VALUE ary, long len)
     else {
 	if (olen > len + ARY_DEFAULT_SIZE) {
 	    REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len);
+	    ARY_SET_CAPA(ary, len);
 	}
 	ARY_SET_HEAP_LEN(ary, len);
     }

Original file line number	Diff line number	Diff line change
`@@ -1332,7 +1332,7 @@ rb_ary_resize(VALUE ary, long len)`
`1332`	`1332`	`ary_double_capa(ary, len);`
`1333`	`1333`	`}`
`1334`	`1334`	`rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen);`
`1335`		`- ARY_SET_HEAP_LEN(ary, len);`
	`1335`	`+ ARY_SET_LEN(ary, len);`
`1336`	`1336`	`}`
`1337`	`1337`	`else if (ARY_EMBED_P(ary)) {`
`1338`	`1338`	`ARY_SET_EMBED_LEN(ary, len);`
`@@ -1347,6 +1347,7 @@ rb_ary_resize(VALUE ary, long len)`
`1347`	`1347`	`else {`
`1348`	`1348`	`if (olen > len + ARY_DEFAULT_SIZE) {`
`1349`	`1349`	`REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len);`
	`1350`	`+ ARY_SET_CAPA(ary, len);`
`1350`	`1351`	`}`
`1351`	`1352`	`ARY_SET_HEAP_LEN(ary, len);`
`1352`	`1353`	`}`