diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 00:40:44 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 00:40:44 +0000 |
| commit | b7f40d86af3e98c4481caf1014ba5423901d4580 (patch) | |
| tree | 371712cf34fa89060354e2a5891dea3f60a99485 /ChangeLog | |
| parent | 911e4ee15a2742d94770e6f55337f261cf37489a (diff) | |
merge revision(s) 33201,33249,33328: [Backport #5564]
* encoding.c (load_encoding): predefined encoding names are safe.
[ruby-dev:44469] [Bug #5279]
* transcode.c (load_transcoder_entry): ditto.
* encoding.c (require_enc): reject only loading from untrusted
load paths. [ruby-dev:44541] [Bug #5279]
* transcode.c (load_transcoder_entry): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,17 @@ +Wed Feb 8 09:36:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (require_enc): reject only loading from untrusted + load paths. [ruby-dev:44541] [Bug #5279] + + * transcode.c (load_transcoder_entry): ditto. + +Wed Feb 8 09:36:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (load_encoding): predefined encoding names are safe. + [ruby-dev:44469] [Bug #5279] + + * transcode.c (load_transcoder_entry): ditto. + Tue Feb 7 14:29:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * st.c (st_foreach): should not yield same pair when checking |