diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-17 16:14:58 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-05-09 20:05:52 +0200 |
| commit | 33c9e18b09f4025ae635ef24bab8eab1a686a711 (patch) | |
| tree | 7a63710a0d9971cd93d42ac97910736ad474e583 /libavfilter/graphparser.c | |
| parent | f844cb9bced3148fca2db5bbb092929526108005 (diff) | |
| download | ffmpeg-33c9e18b09f4025ae635ef24bab8eab1a686a711.tar.gz | |
avfiltergraph: check for sws opts being non-NULL before using them.
Avoid snprintfing a NULL pointer.
CC: libav-stable@libav.org
(cherry picked from commit 6e3c13a559e9ff300b5ca60e1d503e594d7f055c)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 00fb57ad57..0678cd0b35 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -121,7 +121,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind return ret; } - if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")) { + if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") && + ctx->scale_sws_opts) { snprintf(tmp_args, sizeof(tmp_args), "%s:%s", args, ctx->scale_sws_opts); args = tmp_args; |