From d07a013cf92c866f08433db017a2ffe0615daadd Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 Jun 2014 04:28:16 +0000 Subject: [PATCH] string.c: shrink before freezing * string.c (rb_str_freeze): shrink the buffer before freezing, as pointed out by Eric Wong at [ruby-core:63119]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a71ca43e9c..193224a7e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 12 13:27:38 2014 Nobuyoshi Nakada + + * string.c (rb_str_freeze): shrink the buffer before freezing, as + pointed out by Eric Wong at [ruby-core:63119]. + Thu Jun 12 13:09:03 2014 Nobuyoshi Nakada * file.c (expand_path): shrink expanded path which no longer needs diff --git a/string.c b/string.c index b7014f0a65..8a349cb6c0 100644 --- a/string.c +++ b/string.c @@ -1905,6 +1905,8 @@ rb_str_substr(VALUE str, long beg, long len) VALUE rb_str_freeze(VALUE str) { + if (OBJ_FROZEN(str)) return str; + rb_str_resize(str, RSTRING_LEN(str)); return rb_obj_freeze(str); }