kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ruby.c: check argc

Browse source 
* ruby.c (proc_options): check argc before dereference of argv, to get
  rid of potential out-of-bound access.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-02-07 16:20:55 +00:00
parent 93cf7aac7f
commit 8ca2f8565d
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ruby.c
View file

@ -897,11 +897,9 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (envopt) goto noenvopt; if (envopt) goto noenvopt;
forbid_setid("-e"); forbid_setid("-e");
if (!*++s) { if (!*++s) {
s = argv[1]; if (!--argc)
argc--, argv++; rb_raise(rb_eRuntimeError, "no code specified for -e");
} s = *++argv;
if (!s) {
rb_raise(rb_eRuntimeError, "no code specified for -e");
} }
if (!opt->e_script) { if (!opt->e_script) {
opt->e_script = rb_str_new(0, 0); opt->e_script = rb_str_new(0, 0);
@ -917,7 +915,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (*++s) { if (*++s) {
add_modules(&opt->req_list, s); add_modules(&opt->req_list, s);
} }
else if (argv[1]) { else if (argc > 1) {
add_modules(&opt->req_list, argv[1]); add_modules(&opt->req_list, argv[1]);
argc--, argv++; argc--, argv++;
} }
@ -941,12 +939,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
case 'C': case 'C':
case 'X': case 'X':
if (envopt) goto noenvopt; if (envopt) goto noenvopt;
s++; if (!*++s && (!--argc || !(s = *++argv) || !*s)) {
if (!*s) {
s = argv[1];
argc--, argv++;
}
if (!s || !*s) {
rb_fatal("Can't chdir"); rb_fatal("Can't chdir");
} }
if (chdir(s) < 0) { if (chdir(s) < 0) {
@ -1017,7 +1010,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
forbid_setid("-I"); forbid_setid("-I");
if (*++s) if (*++s)
ruby_incpush_expand(s); ruby_incpush_expand(s);
else if (argv[1]) { else if (argc > 1) {
ruby_incpush_expand(argv[1]); ruby_incpush_expand(argv[1]);
argc--, argv++; argc--, argv++;
} }