From 6736ef96eab222e58e6294f42be981a5afb59811 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 6 Jun 2014 22:37:27 +0000 Subject: libgo: Merge to master revision 19184. The next revision, 19185, renames several runtime files, and will be handled in a separate change. From-SVN: r211328 --- libgo/runtime/go-append.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libgo/runtime/go-append.c') diff --git a/libgo/runtime/go-append.c b/libgo/runtime/go-append.c index 8d5dee2..1b2d49e 100644 --- a/libgo/runtime/go-append.c +++ b/libgo/runtime/go-append.c @@ -37,6 +37,7 @@ __go_append (struct __go_open_array a, void *bvalues, uintptr_t bcount, if (count > a.__capacity) { intgo m; + uintptr capmem; void *n; m = a.__capacity; @@ -57,7 +58,9 @@ __go_append (struct __go_open_array a, void *bvalues, uintptr_t bcount, if (element_size > 0 && (uintptr) m > MaxMem / element_size) runtime_panicstring ("growslice: cap out of range"); - n = __go_alloc (m * element_size); + capmem = runtime_roundupsize (m * element_size); + + n = __go_alloc (capmem); __builtin_memcpy (n, a.__values, a.__count * element_size); a.__values = n; -- cgit v1.1