Remove NUL characters in case of text and message parts.

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

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 60ba79658820e9a97da892984487c352ed6f7c08..bbca93180643ecc49b8f58a69ed3177dd0760ad6 100644 (file)
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -133,6 +133,8 @@ class Deliver {
         case 'message':
             if ($message->body_part) {
                 $body_part = $message->body_part;
         case 'message':
             if ($message->body_part) {
                 $body_part = $message->body_part;

+                // remove NUL characters
+                $body_part = str_replace("\0",'',$body_part);

                 $length += $this->clean_crlf($body_part);
                 if ($stream) {
                     $this->preWriteToStream($body_part);
                 $length += $this->clean_crlf($body_part);
                 if ($stream) {
                     $this->preWriteToStream($body_part);