]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[downloader/f4m] Fragment filenames must be sanitized
authorAntti Ajanki <antti.ajanki@iki.fi>
Sun, 3 May 2015 08:04:14 +0000 (11:04 +0300)
committerAntti Ajanki <antti.ajanki@iki.fi>
Sun, 3 May 2015 08:31:42 +0000 (11:31 +0300)
because the fragment was written to a file with a sanitized name by
http_dl.download()

youtube_dl/downloader/f4m.py

index b1a858c452617ed452bc0dcae8d612d22fd224d3..3cb07e15f2896e99f958576905a39401c7547056 100644 (file)
@@ -396,18 +396,19 @@ class F4mFD(FileDownloader):
                 success = http_dl.download(frag_filename, {'url': url})
                 if not success:
                     return False
-                with open(frag_filename, 'rb') as down:
-                    down_data = down.read()
-                    reader = FlvReader(down_data)
-                    while True:
-                        _, box_type, box_data = reader.read_box_info()
-                        if box_type == b'mdat':
-                            dest_stream.write(box_data)
-                            break
+                (down, frag_sanitized) = sanitize_open(frag_filename, 'rb')
+                down_data = down.read()
+                down.close()
+                reader = FlvReader(down_data)
+                while True:
+                    _, box_type, box_data = reader.read_box_info()
+                    if box_type == b'mdat':
+                        dest_stream.write(box_data)
+                        break
                 if live:
-                    os.remove(frag_filename)
+                    os.remove(encodeFilename(frag_sanitized))
                 else:
-                    frags_filenames.append(frag_filename)
+                    frags_filenames.append(frag_sanitized)
             except (compat_urllib_error.HTTPError, ) as err:
                 if live and (err.code == 404 or err.code == 410):
                     # We didn't keep up with the live window. Continue
@@ -430,7 +431,7 @@ class F4mFD(FileDownloader):
         elapsed = time.time() - start
         self.try_rename(tmpfilename, filename)
         for frag_file in frags_filenames:
-            os.remove(frag_file)
+            os.remove(encodeFilename(frag_file))
 
         fsize = os.path.getsize(encodeFilename(filename))
         self._hook_progress({