diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:48:05 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:48:22 +0300 |
commit | 9d5017a20c26b98bdd6fec29f3eaa465a779e24c (patch) | |
tree | c8377c0d1e5f9a1295b76e2eb3e41959b17c3053 /libavfilter/graphparser.c | |
parent | a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626 (diff) | |
parent | 9d3b752fceb0f2a42cac7c2a1109b0629823c99f (diff) |
Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'
* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
-rw-r--r-- | libavfilter/graphparser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 5180bd576d..dd331d12c0 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -62,6 +62,8 @@ static char *parse_link_name(const char **buf, void *log_ctx) (*buf)++; name = av_get_token(buf, "]"); + if (!name) + goto fail; if (!name[0]) { av_log(log_ctx, AV_LOG_ERROR, |