infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for error when exploit is removed 

git-svn-id: file:///home/svn/incoming/trunk@3537 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Matt Miller 2006-02-21 16:36:58 +00:00
parent 5916642428
commit 20550431d6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/msf/core/module_manager.rb
View File

@ -474,9 +474,16 @@ class ModuleManager < ModuleSet
return false if (@modcache_invalidated) return false if (@modcache_invalidated)
if (@modcache and @modcache.group?('FileModificationTimes')) if (@modcache and @modcache.group?('FileModificationTimes'))
curr_mtime = File::Stat.new(file).mtime no_exist = false
if (@modcache['FileModificationTimes'][file].nil? or begin
curr_mtime = File::Stat.new(file).mtime
rescue Errno::ENOENT
no_exist = true
end
if (no_exist or
@modcache['FileModificationTimes'][file].nil? or
@modcache['FileModificationTimes'][file].to_s != curr_mtime.to_i.to_s) @modcache['FileModificationTimes'][file].to_s != curr_mtime.to_i.to_s)
raise ModuleCacheInvalidated, "File #{file} has a new mtime or did not exist" raise ModuleCacheInvalidated, "File #{file} has a new mtime or did not exist"
end end
@ -790,8 +797,8 @@ protected
# #
# FIXME: support demand loading of encoders/nops # FIXME: support demand loading of encoders/nops
# #
if ((check_cache(file)) and if ((demand == false) and
(demand == false) and (check_cache(file)) and
([ MODULE_ENCODER, MODULE_NOP ].include?(type) == false)) ([ MODULE_ENCODER, MODULE_NOP ].include?(type) == false))
return false return false
end end
@ -895,7 +902,11 @@ protected
# cache). # cache).
# #
def has_module_file_changed?(file) def has_module_file_changed?(file)
begin
return (module_history_mtime[file] != File.new(file).mtime) return (module_history_mtime[file] != File.new(file).mtime)
rescue Errno::ENOENT
return false
end
end end
# #