From 238c59842c6f9ab72ace7076a8850b5cc55c421c Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 7 Jan 2008 04:55:26 +0000 Subject: * 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 --- ChangeLog | 4 ++++ re.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * re.c (rb_reg_preprocess): fix fixed_enc condition. + Mon Jan 7 11:51:49 2008 Eric Hodel * 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); } -- cgit v1.2.3