archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r23773 from trunk into ruby_1_9_1.

Browse source 
--
* transcode.c (enc_arg): default interanl encoding may not be set.
  [ruby-core:23932]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-21 10:36:42 +00:00
parent ef72effc0c
commit a50f85f6cb
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jun 21 10:46:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* transcode.c (enc_arg): default interanl encoding may not be set.
[ruby-core:23932]
Sat Jun 20 07:17:52 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/monitor.rb (MonitorMixin::extend_object): should use

4
transcode.c
View file

@ -2394,13 +2394,13 @@ enc_arg(volatile VALUE *arg, const char **name_p, rb_encoding **enc_p)
int encidx;
VALUE encval;
if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
if (((encidx = rb_to_encoding_index(encval = *arg)) < 0) ||
!(enc = rb_enc_from_index(encidx))) {
enc = NULL;
encidx = 0;
n = StringValueCStr(*arg);
}
else {
enc = rb_enc_from_index(encidx);
n = rb_enc_name(enc);
}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 197
#define RUBY_PATCHLEVEL 198
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1