[utils] Fix unescapeHTML for misformed string like "&a"" (#13935)

95f3f7c2 · Yen Chi Hsuan · f5469da9 · 95f3f7c2 · 95f3f7c2 · 95f3f7c2
Unverified Commit 95f3f7c2 authored Aug 19, 2017 by Yen Chi Hsuan
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

ChangeLog ChangeLog +6 -0

test/test_utils.py test/test_utils.py +1 -0

youtube_dl/utils.py youtube_dl/utils.py +1 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+version <unreleased>
+
+Core
+* [utils] Fix unescapeHTML for misformed string like "&a&quot;" (#13935)
+
+
 version 2017.08.18

 Core

--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -279,6 +279,7 @@ class TestUtil(unittest.TestCase):
        self.assertEqual(unescapeHTML('&#47;'), '/')
        self.assertEqual(unescapeHTML('&eacute;'), 'é')
        self.assertEqual(unescapeHTML('&#2013266066;'), '&#2013266066;')
+        self.assertEqual(unescapeHTML('&a&quot;'), '&a"')
        # HTML5 entities
        self.assertEqual(unescapeHTML('&period;&apos;'), '.\'')


--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -596,7 +596,7 @@ def unescapeHTML(s):
    assert type(s) == compat_str

    return re.sub(
-        r'&([^;]+;)', lambda m: _htmlentity_transform(m.group(1)), s)
+        r'&([^&;]+;)', lambda m: _htmlentity_transform(m.group(1)), s)


 def get_subprocess_encoding():