- Make sure attachment name doesn't contain \r\n (#1486832)

14 years ago · 9bb1fc7b0b
parent 7534f6fc59
commit 9bb1fc7b0b
1 changed files with 7 additions and 6 deletions
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@ -86,6 +86,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
      @set_time_limit(0);

      $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
+      $filename = preg_replace('[\r\n]', '', $filename);

      if ($browser->ie && $browser->ver < 7)
        $filename = rawurlencode(abbreviate_string($filename, 55));