summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 04:55:26 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-07 04:55:26 +0000
commit238c59842c6f9ab72ace7076a8850b5cc55c421c (patch)
tree665b494c991fbc96278797742e01ce6ab9810cdb
parentd9d3e87a522ce180768aef2fcb32c236c68b07f2 (diff)
* re.c (rb_reg_preprocess): fix fixed_enc condition.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--re.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index feae1513e45..bb198812a82 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 fc9e8301312..58ba4e0e9d0 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);
}