diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-08-03 23:04:11 +0200 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2015-08-03 23:04:11 +0200 | 
| commit | d96d604e5311628ece0234733dbbfe73a58c8d18 (patch) | |
| tree | 6affc48668d6284700393a521f8856a27ec1815d | |
| parent | e704f87f869b98bbed56d7dd0fe27710306c8272 (diff) | |
YoutubeDL: format spec: don't accept a bare '/' (#6124)
| -rw-r--r-- | test/test_YoutubeDL.py | 1 | ||||
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 2 | 
2 files changed, 3 insertions, 0 deletions
diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py index 20f45f439..9a3c28f8c 100644 --- a/test/test_YoutubeDL.py +++ b/test/test_YoutubeDL.py @@ -311,6 +311,7 @@ class TestFormatSelection(unittest.TestCase):          assert_syntax_error('bestvideo,,best')          assert_syntax_error('+bestaudio')          assert_syntax_error('bestvideo+') +        assert_syntax_error('/')      def test_format_filtering(self):          formats = [ diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index efa3254ce..c608ff91a 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -960,6 +960,8 @@ class YoutubeDL(object):                          selectors.append(current_selector)                          current_selector = None                      elif string == '/': +                        if not current_selector: +                            raise syntax_error('"/" must follow a format selector', start)                          first_choice = current_selector                          second_choice = _parse_format_selection(tokens, inside_choice=True)                          current_selector = FormatSelector(PICKFIRST, (first_choice, second_choice), [])  | 
