summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 04:43:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-05 04:43:40 +0000
commitb6a4e7cea087b176ac82f2cb3fb3f9812a418f40 (patch)
tree74352aed8617258dd89563d71cf09f9f271acdba /ChangeLog
parent13848d6048d7518bd69e2b6f6b72bffaac531032 (diff)
merge revision(s) 44803: [Backport #9485]
* 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_1_9_3@44830 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 75630030b0..e1a43e55fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 5 13:43:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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.
+
Sun Feb 2 05:48:42 2014 Eric Wong <e@80x24.org>
* io.c (rb_io_syswrite): add RB_GC_GUARD