From 1aef602d5a9398ff362de212ae402ffcd8ff76ae Mon Sep 17 00:00:00 2001 From: normal Date: Mon, 24 Sep 2018 07:48:33 +0000 Subject: [PATCH] webrick: raise EOFError in parse when read line is nil [Bug #15146] From: Justin Li git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/httprequest.rb | 4 +++- test/webrick/test_httprequest.rb | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index c40f7c16e4..ac60c3937f 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -445,12 +445,14 @@ module WEBrick def read_request_line(socket) @request_line = read_line(socket, MAX_URI_LENGTH) if socket + raise HTTPStatus::EOFError unless @request_line + @request_bytes = @request_line.bytesize if @request_bytes >= MAX_URI_LENGTH and @request_line[-1, 1] != LF raise HTTPStatus::RequestURITooLarge end + @request_time = Time.now - raise HTTPStatus::EOFError unless @request_line if /^(\S+)\s+(\S++)(?:\s+HTTP\/(\d+\.\d+))?\r?\n/mo =~ @request_line @request_method = $1 @unparsed_uri = $2 diff --git a/test/webrick/test_httprequest.rb b/test/webrick/test_httprequest.rb index 6b99e34569..678efed1ca 100644 --- a/test/webrick/test_httprequest.rb +++ b/test/webrick/test_httprequest.rb @@ -422,4 +422,11 @@ GET / req.body } end + + def test_eof_raised_when_line_is_nil + assert_raise(WEBrick::HTTPStatus::EOFError) { + req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP) + req.parse(StringIO.new("")) + } + end end