Fix bug where last character of a filename extracted from TNEF could …

…be truncated (#5799)
roundcube · Aug 8, 2017 · b629842 · b629842
1 parent c1285a0
commit b629842
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/program/lib/Roundcube/rcube_tnef_decoder.php b/program/lib/Roundcube/rcube_tnef_decoder.php
@@ -387,8 +387,6 @@ protected function _decodeAttachment(&$data, &$attachment_data)
      */
     protected function convertString($str, $use_codepage = false)
     {
-        $str = rtrim($str, "\0");
-
         if ($convert && $this->codepage
             && ($charset = rcube_charset::$windows_codepages[$this->codepage])
         ) {
@@ -398,6 +396,8 @@ protected function convertString($str, $use_codepage = false)
             $str = rcube_charset::convert($str, 'UTF-16LE');
         }
 
+        $str = rtrim($str, "\0");
+
         return $str;
     }
 }