summaryrefslogtreecommitdiff
path: root/extlib/Mail/sendmail.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-30 13:47:46 -0700
committerBrion Vibber <brion@pobox.com>2010-04-30 13:47:46 -0700
commit9fd02a4f11881b3e0e1b3029c7c9e85a799c5ced (patch)
tree35b1f5c040d97ef67f960cab03204b16fe8952a8 /extlib/Mail/sendmail.php
parenta39efbd8d8996f4e9375c397b2f5e8c149fcff68 (diff)
Update PEAR::Mail to 1.2.0 release; fixes deprecation warnings running under PHP 5.3.
Diffstat (limited to 'extlib/Mail/sendmail.php')
-rwxr-xr-x[-rw-r--r--]extlib/Mail/sendmail.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/extlib/Mail/sendmail.php b/extlib/Mail/sendmail.php
index cd248e61d..b056575e9 100644..100755
--- a/extlib/Mail/sendmail.php
+++ b/extlib/Mail/sendmail.php
@@ -20,7 +20,7 @@
* Sendmail implementation of the PEAR Mail:: interface.
* @access public
* @package Mail
- * @version $Revision: 1.19 $
+ * @version $Revision: 294744 $
*/
class Mail_sendmail extends Mail {
@@ -117,7 +117,7 @@ class Mail_sendmail extends Mail {
if (is_a($recipients, 'PEAR_Error')) {
return $recipients;
}
- $recipients = escapeShellCmd(implode(' ', $recipients));
+ $recipients = implode(' ', array_map('escapeshellarg', $recipients));
$headerElements = $this->prepareHeaders($headers);
if (is_a($headerElements, 'PEAR_Error')) {
@@ -141,7 +141,8 @@ class Mail_sendmail extends Mail {
return PEAR::raiseError('From address specified with dangerous characters.');
}
- $from = escapeShellCmd($from);
+ $from = escapeshellarg($from); // Security bug #16200
+
$mail = @popen($this->sendmail_path . (!empty($this->sendmail_args) ? ' ' . $this->sendmail_args : '') . " -f$from -- $recipients", 'w');
if (!$mail) {
return PEAR::raiseError('Failed to open sendmail [' . $this->sendmail_path . '] for execution.');