diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-26 09:41:08 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-26 09:41:08 +0000 |
| commit | 4d6f2314e8ac946ec4b8bc0be10283f0bb2b42de (patch) | |
| tree | 75894d87f62acf79acb966820e1dca8127fea1ff /ext/strscan | |
| parent | 5ee95c149cb25c5def7b4579fb7cfec3e6b5a664 (diff) | |
| download | ruby-4d6f2314e8ac946ec4b8bc0be10283f0bb2b42de.tar.gz ruby-4d6f2314e8ac946ec4b8bc0be10283f0bb2b42de.tar.xz ruby-4d6f2314e8ac946ec4b8bc0be10283f0bb2b42de.zip | |
* ext/strscan/strscan.c (strscan_do_scan): always return nil if p->curr exceeds string size.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/strscan')
| -rw-r--r-- | ext/strscan/strscan.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index dcb70a774..9529bc369 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -1,7 +1,7 @@ /* $Id$ - Copyright (c) 1999-2005 Minero Aoki + Copyright (c) 1999-2006 Minero Aoki This program is free software. You can distribute/modify this program under the terms of @@ -401,6 +401,9 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly) GET_SCANNER(self, p); CLEAR_MATCH_STATUS(p); + if (S_RESTLEN(p) < 0) { + return Qnil; + } if (headonly) { ret = onig_match(RREGEXP(regex)->ptr, (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)), |