diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-09 23:43:16 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-09 23:43:16 +0000 |
commit | 209b0515607f4468288b55c2924ff8e29027b7db (patch) | |
tree | ee68a97d9bc6e777780ba979db45c56acc20db19 /libgo | |
parent | 9d68290acef4b19e56992477c346e814cf8e40c5 (diff) | |
download | gcc-209b0515607f4468288b55c2924ff8e29027b7db.tar.gz |
PR go/65349
runtime: Don't crash if explicitly freeing small map.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221292 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo')
-rw-r--r-- | libgo/runtime/go-map-index.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libgo/runtime/go-map-index.c b/libgo/runtime/go-map-index.c index 499641c5e14..616b00c68c8 100644 --- a/libgo/runtime/go-map-index.c +++ b/libgo/runtime/go-map-index.c @@ -8,6 +8,7 @@ #include <stdlib.h> #include "runtime.h" +#include "malloc.h" #include "go-alloc.h" #include "go-assert.h" #include "map.h" @@ -63,7 +64,8 @@ __go_map_rehash (struct __go_map *map) } } - __go_free (old_buckets); + if (old_bucket_count * sizeof (void *) >= TinySize) + __go_free (old_buckets); map->__bucket_count = new_bucket_count; map->__buckets = new_buckets; |