Fix NUL characters in content-type of ms-tnef attachment (#1488964)

Aleksander Machniak

2013-02-18 7bba0032fe0318399e3522687a3b1ff3a4887486

Fix NUL characters in content-type of ms-tnef attachment (#1488964)

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix NUL characters in content-type of ms-tnef attachment (#1488964)
- Fix regression in handling LDAP contact identifiers (#1488959)
- Updated translations from Transifex
- Fix buggy error template in a frame (#1488938)

 program/lib/tnef_decoder.php

@@ -243,16 +243,16 @@
            /* Store any interesting attributes. */
            switch ($attr_name) {
            case self::MAPI_ATTACH_LONG_FILENAME:
                $value = str_replace("\0", '', $value);
                /* Used in preference to AFILENAME value. */
                $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);
                $attachment_data[0]['name'] = str_replace("\0", '', $attachment_data[0]['name']);
                break;

            case self::MAPI_ATTACH_MIME_TAG:
                $value = str_replace("\0", '', $value);
                /* Is this ever set, and what is format? */
                $attachment_data[0]['type'] = preg_replace('/^(.*)\/.*/', '\1', $value);
                $attachment_data[0]['subtype'] = preg_replace('/.*\/(.*)$/', '\1', $value);
                $attachment_data[0]['subtype'] = str_replace("\0", '', $attachment_data[0]['subtype']);
                break;
            }
        }
@@ -295,9 +295,10 @@
            break;

        case self::AFILENAME:
            $value = $this->_getx($data, $this->_geti($data, 32));
            $value = str_replace("\0", '', $value);
            /* Strip path. */
            $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $this->_getx($data, $this->_geti($data, 32)));
            $attachment_data[0]['name'] = str_replace("\0", '', $attachment_data[0]['name']);
            $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);

            /* Checksum */
            $this->_geti($data, 16);