better fix for bug #812690

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5775 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 2f62a97d34da3bfe54025cc7b373b3d70a9f3ac7..d5c6fdbc679008d43cf3b9bb11dac820ac8f1272 100644 (file)
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -24,6 +24,7 @@ class Deliver_SendMail extends Deliver {
         $rfc822_header = $message->rfc822_header;
        $from = $rfc822_header->from[0];
        $envelopefrom = trim($from->mailbox.'@'.$from->host);
+       $envelopefrom = str_replace(array("\0","\n"),array('',''),$envelopefrom);
        if (strstr($sendmail_path, "qmail-inject")) {
            $stream = popen (escapeshellcmd("$sendmail_path -i -f$envelopefrom"), "w");
        } else {