2 files changed, 8 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 8e60f45ff6..cb6f916a62 100644
--- a/parse.y
+++ b/parse.y
@@ -8341,8 +8341,8 @@ parser_yylex(struct parser_params *parser)
 	    }
 	    goto retry;
 	}
-	while ((c = nextc())) {
-	    switch (c) {
+	while (1) {
+	    switch (c = nextc()) {
 	      case ' ': case '\t': case '\f': case '\r':
 	      case '\13': /* '\v' */
 		space_seen = 1;
diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb
index dc461e6599..e26bcdc07e 100644
--- a/test/ruby/test_parse.rb
+++ b/test/ruby/test_parse.rb
@@ -1087,6 +1087,12 @@ x = __ENCODING__
     end
   end
 
+  def test_eof_in_def
+    assert_raise(SyntaxError) { eval("def m\n\0""end") }
+    assert_raise(SyntaxError) { eval("def m\n\C-d""end") }
+    assert_raise(SyntaxError) { eval("def m\n\C-z""end") }
+  end
+
 =begin
   def test_past_scope_variable
     assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}