diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-18 04:22:31 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-18 04:22:31 +0000 |
| commit | 69f7355be49d98bcfbb1856cdd2ac8a3f601ae60 (patch) | |
| tree | 87aa44bb16eff57ed1bd2171d0dee429481a63ff | |
| parent | 164ad361d894c2a3ce429c8789b4dd08d92fa87d (diff) | |
| download | ruby-69f7355be49d98bcfbb1856cdd2ac8a3f601ae60.tar.gz ruby-69f7355be49d98bcfbb1856cdd2ac8a3f601ae60.tar.xz ruby-69f7355be49d98bcfbb1856cdd2ac8a3f601ae60.zip | |
* transcode.c (transcode_search_path): prevent infinite loop by
searching a path for self conversion.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | transcode.c | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Aug 18 13:21:38 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (transcode_search_path): prevent infinite loop by + searching a path for self conversion. + Mon Aug 18 12:45:24 2008 Tanaka Akira <akr@fsij.org> * io.c (io_enc_str): code conversion removed. diff --git a/transcode.c b/transcode.c index 32e3d082a..33b1c7fc9 100644 --- a/transcode.c +++ b/transcode.c @@ -165,6 +165,9 @@ transcode_search_path(const char *from, const char *to, int found; int pathlen; + if (encoding_equal(from, to)) + return -1; + q = ALLOC(search_path_queue_t); q->enc = from; q->next = NULL; |