Land rapid7#2777, @wchen-r7's fix for safari_lastsession

Author: jvazquez-r7

modules/post/osx/gather/safari_lastsession.rb

@@ -41,8 +41,8 @@ def get_safari_version
     version = ''
 
     f = read_file("/Applications/Safari.app/Contents/version.plist")
-    xml = REXML::Document.new(f)
-    return version if xml.root.nil?
+    xml = REXML::Document.new(f) rescue nil
+    return version if xml.nil?
 
     xml.elements['plist/dict'].each_element do |e|
       if e.text == 'CFBundleShortVersionString'
@@ -76,7 +76,7 @@ def plutil(filename)
   #
   def get_lastsession
     print_status("#{peer} - Looking for LastSession.plist")
-    plutil("~/Library/Safari/LastSession.plist")
+    plutil("#{expand_path("~")}/Library/Safari/LastSession.plist")
   end
 
 
@@ -88,8 +88,8 @@ def get_lastsession
   def get_sessions(lastsession)
     session_dict = nil
 
-    xml = REXML::Document.new(lastsession)
-    return nil if xml.root.nil?
+    xml = REXML::Document.new(lastsession) rescue nil
+    return nil if xml.nil?
 
     xml.elements['plist'].each_element do |e|
       found = false