yugui	2008-11-19 01:48:24 +0900 (Wed, 19 Nov 2008)

  New Revision: 20270

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20270

  Log:
    merges r20243 from trunk into ruby_1_9_1.
    * re.c (rb_reg_desc): re might be NULL.
    * regerror.c (onig_error_code_to_format): message updated.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/re.c
    branches/ruby_1_9_1/regerror.c

Index: ruby_1_9_1/re.c
===================================================================
--- ruby_1_9_1/re.c	(revision 20269)
+++ ruby_1_9_1/re.c	(revision 20270)
@@ -380,7 +380,7 @@
 rb_reg_desc(const char *s, long len, VALUE re)
 {
     VALUE str = rb_str_buf_new2("/");
-    if (rb_enc_asciicompat(rb_enc_get(re))) {
+    if (re && rb_enc_asciicompat(rb_enc_get(re))) {
 	rb_enc_copy(str, re);
     }
     else {
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20269)
+++ ruby_1_9_1/ChangeLog	(revision 20270)
@@ -1,3 +1,9 @@
+Tue Nov 18 15:50:11 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (rb_reg_desc): re might be NULL.
+
+	* regerror.c (onig_error_code_to_format): message updated.
+
 Tue Nov 18 09:42:11 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/optparse.rb (OptionParser::make_switch): makes default
Index: ruby_1_9_1/regerror.c
===================================================================
--- ruby_1_9_1/regerror.c	(revision 20269)
+++ ruby_1_9_1/regerror.c	(revision 20270)
@@ -51,7 +51,7 @@
   case ONIG_NO_SUPPORT_CONFIG:
     p = "no support in this configuration"; break;
   case ONIGERR_MEMORY:
-    p = "fail to memory allocation"; break;
+    p = "failed to allocate memory"; break;
   case ONIGERR_MATCH_STACK_LIMIT_OVER:
     p = "match-stack limit over"; break;
   case ONIGERR_TYPE_BUG:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/