quotemeta() the filename of the cookie file when passing it to `youtu…

…be-dl`. This now allows the filename to contain shell metacharacters.
trizen · Sep 27, 2020 · eb9f04d · eb9f04d
1 parent 00f98d9
commit eb9f04d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/WWW/StrawViewer.pm b/lib/WWW/StrawViewer.pm
@@ -756,12 +756,11 @@ sub _extract_from_ytdl {
     my $cookie_file = $self->get_cookie_file;
 
     if (defined($cookie_file) and -f $cookie_file) {
-        push @ytdl_cmd, '--cookies', $cookie_file;
+        push @ytdl_cmd, '--cookies', quotemeta($cookie_file);
     }
 
     my $json = $self->proxy_stdout(@ytdl_cmd, quotemeta("https://www.youtube.com/watch?v=" . $videoID));
-
-    my $ref = $self->parse_json_string($json);
+    my $ref  = $self->parse_json_string($json);
 
     my @formats;
     if (ref($ref) eq 'HASH' and exists($ref->{formats}) and ref($ref->{formats}) eq 'ARRAY') {

diff --git a/lib/WWW/StrawViewer/Search.pm b/lib/WWW/StrawViewer/Search.pm
@@ -167,16 +167,16 @@ sub related_to_videoID {
 
         my $viewCount = 0;
 
-        if ($info->{viewCountText}{simpleText} =~ /^([\d,]+) views/) {
+        if (($info->{viewCountText}{simpleText} // '') =~ /^([\d,]+) views/) {
             $viewCount = ($1 =~ tr/,//dr);
         }
-        elsif ($info->{viewCountText}{simpleText} =~ /Recommended for you/i) {
+        elsif (($info->{viewCountText}{simpleText} // '') =~ /Recommended for you/i) {
             next;    # filter out recommended videos from related videos
         }
 
         my $lengthSeconds = 0;
 
-        if ($info->{lengthText}{simpleText} =~ /([\d:]+)/) {
+        if (($info->{lengthText}{simpleText} // '') =~ /([\d:]+)/) {
             my $time   = $1;
             my @fields = split(/:/, $time);