Merge pull request #7514 from ping/patch-7301

[neteasemusic] Fixes #7301

diff --git a/test/test_utils.py b/test/test_utils.py
index 01829f71e3b89148b06d6b0fe2eba6d15d6b5dfb..ea1ff0547cbb1e9dd081fb6b90243c0269d7d9ef 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -210,8 +210,8 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unescapeHTML('%20;'), '%20;')
         self.assertEqual(unescapeHTML('/'), '/')
         self.assertEqual(unescapeHTML('/'), '/')
-        self.assertEqual(
-            unescapeHTML('é'), 'é')
+        self.assertEqual(unescapeHTML('é'), 'é')
+        self.assertEqual(unescapeHTML('�'), '�')
 
     def test_daterange(self):
         _20century = DateRange("19000101", "20000101")

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index d39f313a41802f38f91418e12cc89dcd798b0286..d00b14b86d8ea8d43aef6bd7cf5a575cda5f94af 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -396,10 +396,14 @@ def _htmlentity_transform(entity):
             numstr = '0%s' % numstr
         else:
             base = 10
-        return compat_chr(int(numstr, base))
+        # See https://github.com/rg3/youtube-dl/issues/7518
+        try:
+            return compat_chr(int(numstr, base))
+        except ValueError:
+            pass
 
     # Unknown entity in name, return its literal representation
-    return ('&%s;' % entity)
+    return '&%s;' % entity
 
 
 def unescapeHTML(s):