diff mbox

[FFmpeg-devel] ffprobe: fix crash in case -of is specified with an empty string

Message ID 1479381175-15460-1-git-send-email-stefasab@gmail.com
State Accepted
Commit 427a47abcddab15e10ce26d971f712d90c53884b
Headers show

Commit Message

Stefano Sabatini Nov. 17, 2016, 11:12 a.m. UTC 
Fix trac issue #5957.
---
 ffprobe.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Andreas Cadhalpun Nov. 17, 2016, 6:57 p.m. UTC | #1 
On 17.11.2016 12:12, Stefano Sabatini wrote:
> Fix trac issue #5957.
> ---
>  ffprobe.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/ffprobe.c b/ffprobe.c
> index a2980b3..79fe296 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -3311,6 +3311,12 @@ int main(int argc, char **argv)
>          goto end;
>      }
>      w_name = av_strtok(print_format, "=", &buf);
> +    if (!w_name) {
> +        av_log(NULL, AV_LOG_ERROR,
> +               "No name specified for the output format\n");
> +        ret = AVERROR(EINVAL);
> +        goto end;
> +    }
>      w_args = buf;
>  
>      if (show_data_hash) {
> 

LGTM.

Best regards,
Andreas
Stefano Sabatini Nov. 17, 2016, 7:46 p.m. UTC | #2 
On date Thursday 2016-11-17 19:57:13 +0100, Andreas Cadhalpun encoded:
> On 17.11.2016 12:12, Stefano Sabatini wrote:
> > Fix trac issue #5957.
> > ---
> >  ffprobe.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/ffprobe.c b/ffprobe.c
> > index a2980b3..79fe296 100644
> > --- a/ffprobe.c
> > +++ b/ffprobe.c
> > @@ -3311,6 +3311,12 @@ int main(int argc, char **argv)
> >          goto end;
> >      }
> >      w_name = av_strtok(print_format, "=", &buf);
> > +    if (!w_name) {
> > +        av_log(NULL, AV_LOG_ERROR,
> > +               "No name specified for the output format\n");
> > +        ret = AVERROR(EINVAL);
> > +        goto end;
> > +    }
> >      w_args = buf;
> >  
> >      if (show_data_hash) {
> > 
> 
> LGTM.

Applied, thanks.
diff mbox

Patch

diff --git a/ffprobe.c b/ffprobe.c
index a2980b3..79fe296 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -3311,6 +3311,12 @@  int main(int argc, char **argv)
         goto end;
     }
     w_name = av_strtok(print_format, "=", &buf);
+    if (!w_name) {
+        av_log(NULL, AV_LOG_ERROR,
+               "No name specified for the output format\n");
+        ret = AVERROR(EINVAL);
+        goto end;
+    }
     w_args = buf;
 
     if (show_data_hash) {