Merge branch 'master' of https://github.com/rapid7/metasploit-framework

2013-05-08 21:43:55 -05:00 · 2013-05-08 21:43:55 -05:00 · 1c395666c5
parent 866fa167ab f9f769cec8
commit 1c395666c5
1 changed files with 3 additions and 0 deletions
--- a/lib/msf/core/db.rb
+++ b/lib/msf/core/db.rb
@ -2797,6 +2797,9 @@ class DBManager
 		::File.open(filename, 'rb') do |f|
 			data = f.read(4)
 		end
+		if data.nil?
+			raise DBImportError.new("Zero-length file")
+		end

 		case data[0,4]
 		when "PK\x03\x04"