diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-07 00:06:55 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-07 00:06:55 +0000 |
| commit | 5a8d5c873bc2616d1646d3708e6f5f0855129353 (patch) | |
| tree | c95172517d9212d0cdae62c2f48cb057b8b92bbe | |
| parent | 4f0083e45fe977d0c8e728ed39a746161bb3abba (diff) | |
| download | ruby-5a8d5c873bc2616d1646d3708e6f5f0855129353.tar.gz | |
* ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not
have in-bound encoding index.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Feb 7 09:05:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not + have in-bound encoding index. + Thu Feb 07 04:26:28 2008 NARUSE, Yui <naruse@ruby-lang.org> * enc/trans/korean.c: add EUC-KR conversion support by Park Ji-In. diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 9bf96fdb93..a711938df4 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -674,6 +674,8 @@ static void nkf_str_upcase(const char *src, char *dest, size_t length) static nkf_encoding *nkf_enc_from_index(int idx) { if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) { + if (idx == BINARY) + return &nkf_encoding_table[NKF_ENCODING_TABLE_SIZE]; return 0; } return &nkf_encoding_table[idx]; @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-06" +#define RUBY_RELEASE_DATE "2008-02-07" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080206 +#define RUBY_RELEASE_CODE 20080207 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |