[Serializer] Fix DataUriNormalizer's regex

2016-10-24 11:05:30 +02:00 · 2016-10-24 11:05:30 +02:00 · 5dc5dc8475
commit 5dc5dc8475
parent c3b96908e7
2 changed files with 4 additions and 1 deletions
--- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@ -85,7 +85,7 @@ class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
     */
    public function denormalize($data, $class, $format = null, array $context = array())
    {
-        if (!preg_match('/^data:([a-z0-9]+\/[a-z0-9]+(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
+        if (!preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
            throw new UnexpectedValueException('The provided "data:" URI is not valid.');
        }

--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php