From e78bf7976c0269e8b54165c374fcba7ee68a4d2b Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 8 Dec 2015 17:19:58 +0000 Subject: [PATCH] * compile.c (ibf_dump_memsize): should check NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ compile.c | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 132374aef1..8b028a1d44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Dec 9 02:18:52 2015 Koichi Sasada + + * compile.c (ibf_dump_memsize): should check NULL. + Wed Dec 9 01:46:35 2015 NAKAMURA Usaku * string.c (rb_str_init): now accepts new option parameter `encoding'. diff --git a/compile.c b/compile.c index 83132b741c..517b500996 100644 --- a/compile.c +++ b/compile.c @@ -8054,11 +8054,16 @@ ibf_dump_free(void *ptr) static size_t ibf_dump_memsize(const void *ptr) { - struct ibf_dump *dump = (struct ibf_dump *)ptr; - size_t size = sizeof(*dump); - if (dump->iseq_table) size += st_memsize(dump->iseq_table); - if (dump->id_table) size += st_memsize(dump->id_table); - return size; + if (ptr) { + struct ibf_dump *dump = (struct ibf_dump *)ptr; + size_t size = sizeof(*dump); + if (dump->iseq_table) size += st_memsize(dump->iseq_table); + if (dump->id_table) size += st_memsize(dump->id_table); + return size; + } + else { + return 0; + } } static const rb_data_type_t ibf_dump_type = {