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.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/re.c b/re.c
index 186e11aadd..3a2aa5d362 100644
--- a/re.c
+++ b/re.c
@@ -380,7 +380,7 @@ static VALUE
 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 {