From cf0106827d805eb8965e8a3b00baaef694c1c710 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 17 Oct 2013 09:49:58 +0000 Subject: * string.c (STR_HEAP_SIZE): includes TERM_LEN(str). * string.c (rb_str_memsize): use STR_HEAP_SIZE(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 318fd1b0d7..58db8e9d9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 17 18:45:41 2013 Koichi Sasada + + * string.c (STR_HEAP_SIZE): includes TERM_LEN(str). + + * string.c (rb_str_memsize): use STR_HEAP_SIZE(). + Thu Oct 17 17:43:00 2013 Shugo Maeda * vm_insnhelper.c (vm_call_method): set ci->me to 0 when the diff --git a/string.c b/string.c index b81f839eb4..3c689bda40 100644 --- a/string.c +++ b/string.c @@ -127,7 +127,7 @@ VALUE rb_cSymbol; } while (0) #define STR_HEAP_PTR(str) (RSTRING(str)->as.heap.ptr) -#define STR_HEAP_SIZE(str) (RSTRING(str)->as.heap.aux.capa) +#define STR_HEAP_SIZE(str) (RSTRING(str)->as.heap.aux.capa + TERM_LEN(str)) #define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) #define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) @@ -891,7 +891,7 @@ RUBY_FUNC_EXPORTED size_t rb_str_memsize(VALUE str) { if (!STR_EMBED_P(str) && !STR_SHARED_P(str)) { - return RSTRING(str)->as.heap.aux.capa; + return STR_HEAP_SIZE(str); } else { return 0; -- cgit v1.2.3