summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 14:47:15 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 14:47:15 +0000
commit90490d673211f523f27ffc5c79d15deb05d31967 (patch)
treee1629abe31922bda9e71943f04ebd2f64fd49e29 /ChangeLog
parent205b5c9cd64a5a0d5f104159e919e82a03b10cb4 (diff)
merge revision(s) 39637,40900: [Backport #8440]
load.c: reorder conditions * load.c (loaded_feature_path): reorder conditions so simple comparision comes first. * load.c (loaded_feature_path): fix invalid read by index underflow. the beginning of name is also a boundary as well as just after '/'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 58eb29225f..fb938e1476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 4 23:42:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (loaded_feature_path): fix invalid read by index underflow.
+ the beginning of name is also a boundary as well as just after '/'.
+
Tue Jun 4 23:32:12 2013 Charlie Somerville <charliesome@ruby-lang.org>
* variable.c (set_const_visibility): use rb_frame_this_func() instead