summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-18 15:10:37 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-18 15:10:37 +0000
commit6bade45b2444282bc81eafb3fd722dbad2af66b8 (patch)
treeb85e5257516a598810b5dd2bd5c74a969df83c5e
parent1ae88a271608cec765bc12a5c14048c35dadd3bc (diff)
downloadruby-6bade45b2444282bc81eafb3fd722dbad2af66b8.tar.gz
ruby-6bade45b2444282bc81eafb3fd722dbad2af66b8.tar.xz
ruby-6bade45b2444282bc81eafb3fd722dbad2af66b8.zip
* bignum.c (rb_cstr_to_inum): wrong radix check. a patch from
Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32628]. * bignum.c (big2str_find_n1): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--bignum.c4
-rw-r--r--version.h6
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 88fee2618..1c82985e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 19 00:09:19 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_cstr_to_inum): wrong radix check. a patch from
+ Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32628].
+
+ * bignum.c (big2str_find_n1): ditto.
+
Tue Dec 18 23:53:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): fix for segfault. [ruby-dev:31372]
diff --git a/bignum.c b/bignum.c
index 624a4e596..c840fe06f 100644
--- a/bignum.c
+++ b/bignum.c
@@ -801,7 +801,7 @@ big2str_find_n1(VALUE x, int base)
};
long bits;
- if (base < 2 && 36 < base)
+ if (base < 2 || 36 < base)
rb_bug("illegal radix %d", base);
if (FIXNUM_P(x)) {
@@ -908,7 +908,7 @@ rb_big2str0(VALUE x, int base, int trim)
return rb_str_new2("0");
}
- if (base < 2 && 36 < base)
+ if (base < 2 || 36 < base)
rb_raise(rb_eArgError, "illegal radix %d", base);
n2 = big2str_find_n1(x, base);
diff --git a/version.h b/version.h
index 87b62e894..aa8cb83eb 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-12-18"
+#define RUBY_RELEASE_DATE "2007-12-19"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071218
+#define RUBY_RELEASE_CODE 20071219
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];