ifaddr.c: fix memsize

* ext/socket/ifaddr.c (ifaddr_memsize): do not count the whole
  rb_ifaddr_t array for each elements.  the header size is
  included in the first element for the time being.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 4 deletions

diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
index f4c1698162..a2dce236d9 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -54,11 +54,12 @@ ifaddr_free(void *ptr)
 static size_t
 ifaddr_memsize(const void *ptr)
 {
+    size_t size = offsetof(rb_ifaddr_root_t, ary);
     const rb_ifaddr_t *ifaddr;
-    const rb_ifaddr_root_t *root;
     ifaddr = ptr;
-    root = get_root(ifaddr);
-    return sizeof(rb_ifaddr_root_t) + (root->numifaddrs - 1) * sizeof(rb_ifaddr_t);
+    if (ifaddr->ord == 0) size = sizeof(rb_ifaddr_root_t);
+    size += sizeof(struct ifaddrs);
+    return size;
 }
 
 static const rb_data_type_t ifaddr_type = {
@@ -105,7 +106,7 @@ rsock_getifaddrs(void)
         numifaddrs++;
 
     addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, 0);
-    root = xmalloc(sizeof(rb_ifaddr_root_t) + (numifaddrs-1) * sizeof(rb_ifaddr_t));
+    root = xmalloc(offsetof(rb_ifaddr_root_t, ary) + numifaddrs * sizeof(rb_ifaddr_t));
     root->refcount = 0;
     root->numifaddrs = numifaddrs;