2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index feae1513e4..bb198812a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan  7 13:54:57 2008  Tanaka Akira  <akr@fsij.org>
+
+	* re.c (rb_reg_preprocess): fix fixed_enc condition.
+
 Mon Jan  7 11:51:49 2008  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/generators/ri_generator.rb:  Merge documentation from the
diff --git a/re.c b/re.c
index fc9e830131..58ba4e0e9d 100644
--- a/re.c
+++ b/re.c
@@ -1914,7 +1914,7 @@ rb_reg_preprocess(const char *p, const char *end, rb_encoding *enc,
     if (unescape_nonascii(p, end, enc, buf, fixed_enc, err) != 0)
         return Qnil;
 
-    if (fixed_enc) {
+    if (*fixed_enc) {
         rb_enc_associate(buf, *fixed_enc);
     }