Merge branch 'master' into php5

* master:
  Quote shell argument with escapeshellarg()
This commit is contained in:
Andreas Fischer 2014-12-04 20:00:45 +01:00
commit a3f52dcf61

View File

@ -152,7 +152,7 @@ class Net_SCP
return false; return false;
} }
if (!$this->ssh->exec('scp -t "' . $remote_file . '"', false)) { // -t = to if (!$this->ssh->exec('scp -t ' . escapeshellarg($remote_file), false)) { // -t = to
return false; return false;
} }
@ -226,7 +226,7 @@ class Net_SCP
return false; return false;
} }
if (!$this->ssh->exec('scp -f "' . $remote_file . '"', false)) { // -f = from if (!$this->ssh->exec('scp -f ' . escapeshellarg($remote_file), false)) { // -f = from
return false; return false;
} }