X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=2554a2abd7e86eeac1c92dddf6e90a307f8b9c9f;hb=95f3f7c20a05e7ac490e768b8470b20538ef8581;hp=fdf5e29e7d417b94ba7f83129a8420f93ed31217;hpb=609ff8ca19f1c4c168a81121074b91cc0f0d4c47;p=youtube-dl

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index fdf5e29e7..2554a2abd 100644
--- 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():
@@ -2733,6 +2733,8 @@ def cli_option(params, command_option, param):
 
 def cli_bool_option(params, command_option, param, true_value='true', false_value='false', separator=None):
     param = params.get(param)
+    if param is None:
+        return []
     assert isinstance(param, bool)
     if separator:
         return [command_option + separator + (true_value if param else false_value)]