summaryrefslogtreecommitdiff
path: root/regcomp.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-21 01:11:15 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-21 01:11:15 (GMT)
commitde341005c80a43684e3704c8462de62c8d4bf431 (patch)
tree2b80bc41169e886d8ca50c156220836663d4196a /regcomp.c
parentdbf07b09fda09f31fb5cbc43088c05a56b847ef7 (diff)
* regcomp.c (print_enc_string): follow enclen's change.
* regcomp.c (onig_print_compiled_byte_code): ditto. * regcomp.c (onig_print_compiled_byte_code): change prototype. * regint.c (onig_print_compiled_byte_code): comment out. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regcomp.c')
-rw-r--r--regcomp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/regcomp.c b/regcomp.c
index caf7d69..4a4f1a7 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5046,7 +5046,7 @@ static void print_enc_string(FILE* fp, OnigEncoding enc,
fputc((int )code, fp);
}
- p += enclen(enc, p);
+ p += enclen(enc, p, end);
}
}
else {
@@ -5885,7 +5885,7 @@ p_len_string(FILE* f, LengthType len, int mb_len, UChar* s)
}
extern void
-onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp,
+onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp,
OnigEncoding enc)
{
int i, n, arg_type;
@@ -5984,7 +5984,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp,
break;
case OP_EXACT1_IC:
- len = enclen(enc, bp);
+ len = enclen(enc, bp, bpend);
p_string(f, len, bp);
bp += len;
break;
@@ -6146,7 +6146,7 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
else
fputs(" ", f);
}
- onig_print_compiled_byte_code(f, bp, &bp, reg->enc);
+ onig_print_compiled_byte_code(f, bp, end, &bp, reg->enc);
}
fprintf(f, "\n");