From 6fa297991193239a6f167b92a3c4fc3e78ff400a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor <ian@gcc.gnu.org> Date: Tue, 20 Sep 2011 22:06:20 +0000 Subject: [PATCH] Fix calling make with slice whose element type is size zero. From-SVN: r179019 --- libgo/runtime/go-make-slice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libgo/runtime/go-make-slice.c b/libgo/runtime/go-make-slice.c index cd2d55bd538d..d0e8369c1f6c 100644 --- a/libgo/runtime/go-make-slice.c +++ b/libgo/runtime/go-make-slice.c @@ -35,7 +35,8 @@ __go_make_slice2 (const struct __go_type_descriptor *td, uintptr_t len, icap = (int) cap; if (cap < len || (uintptr_t) icap != cap - || cap > (uintptr_t) -1U / std->__element_type->__size) + || (std->__element_type->__size > 0 + && cap > (uintptr_t) -1U / std->__element_type->__size)) __go_panic_msg ("makeslice: cap out of range"); ret.__count = ilen; -- GitLab