From: Naglis Jonaitis <njonaitis@gmail.com>
Date: Thu, 26 Mar 2015 15:15:27 +0000 (+0200)
Subject: [utils] Escape all HTML entities written in hexadecimal form
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=91757b0f373ec3201f95066eeb0e09ebdcc1a067;p=youtube-dl

[utils] Escape all HTML entities written in hexadecimal form
---

diff --git a/test/test_utils.py b/test/test_utils.py
index a8ab87685..abaf1ab73 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -200,6 +200,8 @@ class TestUtil(unittest.TestCase):
 
     def test_unescape_html(self):
         self.assertEqual(unescapeHTML('%20;'), '%20;')
+        self.assertEqual(unescapeHTML('&#x2F;'), '/')
+        self.assertEqual(unescapeHTML('&#47;'), '/')
         self.assertEqual(
             unescapeHTML('&eacute;'), 'é')
 
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 472d4df41..245d623d8 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -348,7 +348,7 @@ def _htmlentity_transform(entity):
     if entity in compat_html_entities.name2codepoint:
         return compat_chr(compat_html_entities.name2codepoint[entity])
 
-    mobj = re.match(r'#(x?[0-9]+)', entity)
+    mobj = re.match(r'#(x[0-9a-fA-F]+|[0-9]+)', entity)
     if mobj is not None:
         numstr = mobj.group(1)
         if numstr.startswith('x'):