1 files changed, 5 insertions, 2 deletions
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 9e50fb4943..fc0913349d 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1012,10 +1012,13 @@ class CGI
           end
 
           c = if bufsize < content_length
-                stdinput.read(bufsize) or ''
+                stdinput.read(bufsize)
               else
-                stdinput.read(content_length) or ''
+                stdinput.read(content_length)
               end
+          if c.nil?
+            raise EOFError, "bad content body"
+          end
           buf.concat(c)
           content_length -= c.size
         end