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

diff --git a/ChangeLog b/ChangeLog
index 9a0fad673d9484769237dfba717f841b2ab5fac7..9eab4d1e7a34b573a7bd3582c2ab53e23fb42b74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Core
+* [utils] Fix unescapeHTML for misformed string like "&a&quot;" (#13935)
+
+

 version 2017.08.18
 
 Core
 version 2017.08.18
 
 Core

diff --git a/test/test_utils.py b/test/test_utils.py
index 2aab16b97c300ee1858cffba0eff3f352009a404..e50f3764e57050c560365eb566979e171538985b 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -279,6 +279,7 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unescapeHTML('/'), '/')
         self.assertEqual(unescapeHTML('é'), 'é')
         self.assertEqual(unescapeHTML('�'), '�')
         self.assertEqual(unescapeHTML('/'), '/')
         self.assertEqual(unescapeHTML('é'), 'é')
         self.assertEqual(unescapeHTML('�'), '�')

+        self.assertEqual(unescapeHTML('&a"'), '&a"')

         # HTML5 entities
         self.assertEqual(unescapeHTML('.''), '.\'')
 
         # HTML5 entities
         self.assertEqual(unescapeHTML('.''), '.\'')
 

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index c9cbd58426e2c63e95d317ef81b01472d2a166c6..2554a2abd7e86eeac1c92dddf6e90a307f8b9c9f 100644 (file)
--- 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(
     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():
 
 
 def get_subprocess_encoding():