* include/ruby/re.h (struct rmatch_offset): new struct for character

  offsets.
  (struct rmatch): new struct.
  (struct RMatch): reference struct rmatch.
  (RMATCH_REGS): new macro.

* re.c (match_alloc): initialize struct rmatch.
  (pair_byte_cmp): new function.
  (update_char_offset): update character offsets.
  (match_init_copy): copy regexp and character offsets.
  (match_sublen): removed.
  (match_offset): use update_char_offset.
  (match_begin): ditto.
  (match_end): ditto.
  (rb_reg_search): make character offset updated flag false.
  (match_size): use RMATCH_REGS.
  (match_backref_number): ditto.
  (rb_reg_nth_defined): ditto.
  (rb_reg_nth_match): ditto.
  (rb_reg_match_pre): ditto.
  (rb_reg_match_post): ditto.
  (rb_reg_match_last): ditto.
  (match_array): ditto.
  (match_aref): ditto.
  (match_values_at): ditto.
  (match_inspect): ditto.

* string.c (rb_str_subpat_set): use RMATCH_REGS.
  (rb_str_sub_bang): ditto.
  (str_gsub): ditto.
  (rb_str_split_m): ditto.
  (scan_once): ditto.

* gc.c (obj_free): free character offsets.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/gc.c b/gc.c
index fec5802e71..4ef74f6e36 100644
--- a/gc.c
+++ b/gc.c
@@ -1322,9 +1322,12 @@ obj_free(VALUE obj)
 	}
 	break;
       case T_MATCH:
-	if (RANY(obj)->as.match.regs) {
-	    onig_region_free(RANY(obj)->as.match.regs, 0);
-	    RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
+	if (RANY(obj)->as.match.rmatch) {
+            struct rmatch *rm = RANY(obj)->as.match.rmatch;
+	    onig_region_free(&rm->regs, 0);
+            if (rm->char_offset)
+                RUBY_CRITICAL(free(rm->char_offset));
+	    RUBY_CRITICAL(free(rm));
 	}
 	break;
       case T_FILE: