Module: libav Branch: master Commit: bcc94328980e6c56546792ab08b0756abdce310b
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Mon Feb 25 12:32:49 2013 +0100 opt: check the return values of av_get_token for ENOMEM. --- libavutil/opt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 2cc6f6c..f2b9473 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -562,9 +562,16 @@ static int parse_key_value_pair(void *ctx, const char **buf, char *val; int ret; + if (!key) + return AVERROR(ENOMEM); + if (*key && strspn(*buf, key_val_sep)) { (*buf)++; val = av_get_token(buf, pairs_sep); + if (!val) { + av_freep(&key); + return AVERROR(ENOMEM); + } } else { av_log(ctx, AV_LOG_ERROR, "Missing key or no key/value separator found after key '%s'\n", key); av_free(key); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
