From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 14 Apr 2015 11:50:53 +0000 (+0600)
Subject: [brightcove] Handle non well-formed XMLs (#5421)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=94c1255782414cdcda565717e31c91734ec00990;p=youtube-dl

[brightcove] Handle non well-formed XMLs (#5421)
---

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dl/extractor/brightcove.py
index b37857b2e..117cb00e6 100644
--- a/youtube_dl/extractor/brightcove.py
+++ b/youtube_dl/extractor/brightcove.py
@@ -117,7 +117,10 @@ class BrightcoveIE(InfoExtractor):
         object_str = re.sub(r'(<object[^>]*)(xmlns=".*?")', r'\1', object_str)
         object_str = fix_xml_ampersands(object_str)
 
-        object_doc = xml.etree.ElementTree.fromstring(object_str.encode('utf-8'))
+        try:
+            object_doc = xml.etree.ElementTree.fromstring(object_str.encode('utf-8'))
+        except xml.etree.ElementTree.ParseError:
+            return
 
         fv_el = find_xpath_attr(object_doc, './param', 'name', 'flashVars')
         if fv_el is not None:
@@ -185,7 +188,7 @@ class BrightcoveIE(InfoExtractor):
                 [^>]*?>\s*<param\s+name="movie"\s+value="https?://[^/]*brightcove\.com/
             ).+?>\s*</object>''',
             webpage)
-        return [cls._build_brighcove_url(m) for m in matches]
+        return filter(None, [cls._build_brighcove_url(m) for m in matches])
 
     def _real_extract(self, url):
         url, smuggled_data = unsmuggle_url(url, {})