Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'

* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f': graphparser: Check av_get_token() memory error Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 9d5017a20c
parent a4cd057bc7 9d3b752fce
commit 9d5017a20c
1 changed files with 2 additions and 0 deletions
--- 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,