From 7cbb52ecab90206eccb8cb629019d3a7816769f0 Mon Sep 17 00:00:00 2001 From: Simon Thelen Date: Sat, 20 Jun 2015 18:52:50 +0200 Subject: libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'. Signed-off-by: Michael Niedermayer --- libavfilter/formats.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 2451bf70c9..8758b3d113 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -637,23 +637,20 @@ int ff_parse_channel_layout(int64_t *ret, int *nret, const char *arg, void *log_ctx) { char *tail; - int64_t chlayout, count; + int64_t chlayout; - if (nret) { - count = strtol(arg, &tail, 10); - if (*tail == 'c' && !tail[1] && count > 0 && count < 63) { - *nret = count; - *ret = 0; - return 0; - } - } chlayout = av_get_channel_layout(arg); if (chlayout == 0) { chlayout = strtol(arg, &tail, 10); - if (*tail || chlayout == 0) { + if (!(*tail == '\0' || *tail == 'c' && *(tail + 1) == '\0') || chlayout <= 0 || chlayout > 63) { av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); return AVERROR(EINVAL); } + if (nret) { + *nret = chlayout; + *ret = 0; + return 0; + } } *ret = chlayout; if (nret) -- cgit v1.2.3