* range.c (range_step): 'iter' here should be an array.

* marshal.c (w_object): should retrieve __member__ data from
  non-singleton class.

* variable.c (rb_cvar_get): class variable override check added.

* variable.c (rb_cvar_set): ditto

* variable.c (rb_cvar_declare): ditto.

* parse.y (parse_regx): handle backslash escaping of delimiter here.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/regex.c b/regex.c
index 206e99a0c..9a38c0058 100644
--- a/regex.c
+++ b/regex.c
@@ -2897,6 +2897,7 @@ re_compile_fastmap(bufp)
 
       case duplicate:
 	bufp->can_be_null = 1;
+	if (*p >= bufp->re_nsub) break;
 	fastmap['\n'] = 1;
       case anychar_repeat:
       case anychar:
@@ -3740,6 +3741,8 @@ re_match(bufp, string_arg, size, pos, regs)
 	  int regno = *p++;   /* Get which register to match against */
 	  register unsigned char *d2, *dend2;
 
+	  /* Check if there's corresponding group */
+	  if (regno >= num_regs) goto fail;
 	  /* Check if corresponding group is still open */
 	  if (IS_ACTIVE(reg_info[regno])) goto fail;