From df05fde0e26b0209143f792bedb4441c4eaed129 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 16:11:46 +0000 Subject: merges r24714 from trunk into ruby_1_9_1. -- * parse.y (rb_enc_symname2_p): not depend on nul terminator. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa801c4ec..3008fddb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Aug 30 16:38:56 2009 Nobuyoshi Nakada + + * parse.y (rb_enc_symname2_p): not depend on nul terminator. + Sun Aug 30 01:15:31 2009 NARUSE, Yui * ext/zlib/zlib.c (gzfile_read_all): use gzfile_newstr; diff --git a/parse.y b/parse.y index ec09c018c..9ea945abf 100644 --- a/parse.y +++ b/parse.y @@ -9394,7 +9394,7 @@ rb_enc_symname2_p(const char *name, int len, rb_encoding *enc) } break; } - return *m ? Qfalse : Qtrue; + return m == e; } static ID diff --git a/version.h b/version.h index dc0eafa76..81db6c4e9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 307 +#define RUBY_PATCHLEVEL 308 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit