Merge branch 'master' of github.com:rapid7/metasploit-framework into jvazquez-r7-winamp_maki_bof

lib/msf/core/exploit/fileformat.rb

@@ -26,8 +26,12 @@ module Exploit::FILEFORMAT
 		)
 	end
 
+	def file_format_filename
+		datastore['FILENAME']
+	end
+
 	def file_create(data)
-		fname = datastore['FILENAME']
+		fname = file_format_filename
 		ltype = "exploit.fileformat.#{self.shortname}"
 		full_path = store_local(ltype, nil, data, fname)
 		print_good "#{fname} stored at #{full_path}"