summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-13 20:02:31 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-13 20:02:31 +0000
commit6f6823bef2200eff07c7adcb32c39bc4a8362568 (patch)
tree1047e71514bc90865b36b68ef57c002ac467aa10
parent4482f526f80d330bf400ef86ddfb2c54d36d5597 (diff)
* io.c (rb_f_syscall): Fix buffer overflow with syscall
arguments. [ruby-bugs:PR#8541] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
-rw-r--r--version.h8
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 67c2c18ee7..1d3db011a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 13 02:21:12 2007 Sam Roberts <sroberts@uniserve.com>
+
+ * io.c (rb_f_syscall): Fix buffer overflow with syscall
+ arguments. [ruby-bugs:PR#8541]
+
Sat Feb 10 09:33:47 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_variant2val): sorry, fix the enbug.
diff --git a/io.c b/io.c
index cbbce571e8..9275acaea7 100644
--- a/io.c
+++ b/io.c
@@ -5047,6 +5047,8 @@ rb_f_syscall(argc, argv)
rb_secure(2);
if (argc == 0)
rb_raise(rb_eArgError, "too few arguments for syscall");
+ if (argc > sizeof(arg) / sizeof(arg[0]))
+ rb_raise(rb_eArgError, "too many arguments for syscall");
arg[0] = NUM2LONG(argv[0]); argv++;
while (items--) {
VALUE v = rb_check_string_type(*argv);
diff --git a/version.h b/version.h
index 045843bfd4..4089e94b6b 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
-#define RUBY_RELEASE_DATE "2007-02-10"
+#define RUBY_RELEASE_DATE "2007-02-14"
#define RUBY_VERSION_CODE 185
-#define RUBY_RELEASE_CODE 20070210
-#define RUBY_PATCHLEVEL 19
+#define RUBY_RELEASE_CODE 20070214
+#define RUBY_PATCHLEVEL 20
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 14
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];