symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+9Lines changed: 9 additions & 0 deletions
@@ -154,6 +154,8 @@ public function setAutoEtag()
      * @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename
      *
      * @return $this
+     *
+     * @throws \InvalidArgumentException
      */
     public function setContentDisposition($disposition, $filename = '', $filenameFallback = '')
     {
@@ -164,6 +166,10 @@ public function setContentDisposition($disposition, $filename = '', $filenameFal
         if ('' === $filenameFallback && (!preg_match('/^[\x20-\x7e]*$/', $filename) || false !== strpos($filename, '%'))) {
             $encoding = mb_detect_encoding($filename, null, true);
 
+            if (false === $encoding) {
+                throw new \InvalidArgumentException('The filename encoding cannot be detected.');
+            }
+
             for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) {
                 $char = mb_substr($filename, $i, 1, $encoding);
 
 
@@ -68,6 +68,15 @@ public function testSetContentDispositionGeneratesSafeFallbackFilename()
         $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testSetContentDispositionThrowsExceptionWhenPassingInvalidEncodedFilename()
+    {
+        $response = new BinaryFileResponse(__FILE__);
+        $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, utf8_decode('föö.html'));
+    }
+
     /**
      * @dataProvider provideRanges
      */