Null stripping needs to be done after we do unicode conversion, since…

… it's null bytes is 2 bytes in length
horde · Jan 29, 2015 · b8fb2f4 · b8fb2f4
1 parent ab6e1fd
commit b8fb2f4
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/framework/Compress/lib/Horde/Compress/Tnef.php b/framework/Compress/lib/Horde/Compress/Tnef.php
@@ -407,14 +407,6 @@ protected function _extractMapiAttributes($data)
                     /* Pad to next 4 byte boundary. */
                     $datalen = $length + ((4 - ($length % 4)) % 4);
 
-                    switch ($attr_type) {
-                    case self::MAPI_STRING:
-                    case self::MAPI_UNICODE_STRING:
-                        // Strings are null-terminated.
-                        --$length;
-                        break;
-                    }
-
                     /* Read and truncate to length. */
                     $value = substr($this->_getx($data, $datalen), 0, $length);
                 }
@@ -429,6 +421,15 @@ protected function _extractMapiAttributes($data)
                     );
                     break;
                 }
+
+                switch ($attr_type) {
+                case self::MAPI_STRING:
+                case self::MAPI_UNICODE_STRING:
+                    // Strings are null-terminated.
+                    $value = substr($value, 0, -1);
+                    break;
+                }
+
                 break;
             default:
                 $this->_logger->notice(sprintf(