From 104c5f6b555de908191b70a565579b99402a707f Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 30 Oct 2009 09:58:25 +0000 Subject: [PATCH] * string.c (trnext): detect empty range and raise exception. [ruby-dev:39108] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 675f55409b..a31a883e15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 30 18:54:04 2009 Yukihiro Matsumoto + + * string.c (trnext): detect empty range and raise exception. + [ruby-dev:39108] + Fri Oct 30 17:01:46 2009 Nobuyoshi Nakada * vm_eval.c (enum call_type): get rid of last comma. diff --git a/string.c b/string.c index 1dfab48cc1..e7f7e8673a 100644 --- a/string.c +++ b/string.c @@ -4642,7 +4642,17 @@ trnext(struct tr *t, rb_encoding *enc) if (t->p < t->pend) { unsigned int c = rb_enc_codepoint_len(t->p, t->pend, &n, enc); t->p += n; - if (t->now > c) continue; + if (t->now > c) { + if (t->now < 0x80 && c < 0x80) { + rb_raise(rb_eArgError, + "invalid range \"%c-%c\" in string transliteration", + t->now, c); + } + else { + rb_raise(rb_eArgError, "invalid range in string transliteration"); + } + continue; /* not reached */ + } t->gen = 1; t->max = c; }