2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bae89f159..85f31af996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 21 18:41:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (proc_options): fix pointer overrun. do not advance argv
+	  until it is valid.
+
 Sat Nov 21 13:59:09 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/digest/sha1/extconf.rb: OpenSSL's struct name for SHA1 is
diff --git a/ruby.c b/ruby.c
index 8a93921dbb..ab6d89a280 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1088,7 +1088,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
 	    (((allow_envopt) || !envopt) ? (void)0 : \
 	     rb_raise(rb_eRuntimeError, "invalid switch in RUBYOPT: --" name))
 #	define need_argument(name, s, needs_arg) \
-	    ((*(s)++ ? !*(s) : (!--argc || !((s) = *++argv))) && (needs_arg) ? \
+	    ((*(s) ? !*++(s) : (!argc || !((s) = argv[1]) || (--argc, ++argv, 0))) && (needs_arg) ? \
 	     rb_raise(rb_eRuntimeError, "missing argument for --" name) \
 	     : (void)0)
 #	define is_option_with_arg(name, allow_hyphen, allow_envopt)	\