summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 15:54:46 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-16 15:54:46 +0000
commit46561d573e92bcb0de52d825b7731aaac3865c17 (patch)
tree3d88c796769bedc1db3ec5a6ea85f534aecb0ec8 /ChangeLog
parentd423965b61004063dd3c9666fdbef5f85d122de4 (diff)
merge revision(s) r44803: [Backport #9484]
* string.c (rb_str_modify_expand): enable capacity and disable assocation with packed objects when setting capa, so that pack("p") string fails to unpack properly after modified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f4cb2f2e7..1f2f464f03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 17 00:45:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_modify_expand): enable capacity and disable
+ association with packed objects when setting capa, so that
+ pack("p") string fails to unpack properly after modified.
+
Sun Feb 16 01:36:57 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/yaml/emitter.c: merge libyaml 0.1.5