Merge pull request Intervention#983 from damiengrandi/patch-1

Bugfix for decodeDataUrl when data contains newlines
dietercoopman · Jul 5, 2021 · 94c1799 · 94c1799
2 parents 8e5d38f + e2d032d
commit 94c1799
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Intervention/Image/AbstractDecoder.php b/src/Intervention/Image/AbstractDecoder.php
@@ -295,7 +295,7 @@ private function decodeDataUrl($data_url)
         }
 
         $pattern = "/^data:(?:image\/[a-zA-Z\-\.]+)(?:charset=\".+\")?;base64,(?P<data>.+)$/";
-        preg_match($pattern, $data_url, $matches);
+        preg_match($pattern, str_replace(["\n", "\r"], '', $data_url), $matches);
 
         if (is_array($matches) && array_key_exists('data', $matches)) {
             return base64_decode($matches['data']);