diff --git a/ChangeLog b/ChangeLog
index 7553af8167..115628255d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec 21 10:03:33 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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.
+
 Mon Dec 21 08:04:34 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* object.c: BasicObject#initialize accepts any number of arguments
diff --git a/regcomp.c b/regcomp.c
index caf7d69a1e..4a4f1a7f4c 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");
diff --git a/regint.h b/regint.h
index 164828f430..05cd0892e2 100644
--- a/regint.h
+++ b/regint.h
@@ -788,7 +788,7 @@ typedef struct {
 
 extern OnigOpInfoType OnigOpInfo[];
 
-extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar** nextp, OnigEncoding enc));
+/* extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc)); */
 
 #ifdef ONIG_DEBUG_STATISTICS
 extern void onig_statistics_init P_((void));