summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-11 11:05:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-11 11:05:21 +0000
commit5275ebfd1591d05b6154a2445516f6d8d3561b6c (patch)
tree074bf98ab6325e58641d4be74f667855d4320c0a /encoding.c
parentf39f27008203ec21427b03aa82f03b1c9fafb332 (diff)
downloadruby-5275ebfd1591d05b6154a2445516f6d8d3561b6c.tar.gz
ruby-5275ebfd1591d05b6154a2445516f6d8d3561b6c.tar.xz
ruby-5275ebfd1591d05b6154a2445516f6d8d3561b6c.zip
* encoding.c (rb_enc_aliases_enc_i): skips default internal.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c
index 3253bfdd2..8a2f9dbfb 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1297,6 +1297,7 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
if (NIL_P(str)) {
rb_encoding *enc = rb_enc_from_index(idx);
+ if (!enc) return ST_CONTINUE;
if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
return ST_CONTINUE;
}