diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-05 19:24:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-05 19:28:19 +0100 |
| commit | c9bfd6a8c35a2102e730aca12f6e09d1627f76b3 (patch) | |
| tree | 77cf3124d14cd5594a36fe77779338475ceac9e0 /libavutil | |
| parent | 3692d859f45fa8765fa5a330e79108b03c17c6bd (diff) | |
| download | ffmpeg-c9bfd6a8c35a2102e730aca12f6e09d1627f76b3.tar.gz | |
libavutil/channel_layout: Check strtol*() for failure
Fixes assertion failure
Fixes: 4f5814bb15d2dda6fc18ef9791b13816/signal_sigabrt_7ffff6ae7cc9_65_7209d160d168b76f311be6cd64a548eb.wv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/channel_layout.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index a59ba4610f..601c7e677c 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -122,13 +122,16 @@ static uint64_t get_channel_layout_single(const char *name, int name_len) strlen(channel_names[i].name) == name_len && !memcmp(channel_names[i].name, name, name_len)) return (int64_t)1 << i; + + errno = 0; i = strtol(name, &end, 10); - if ((end + 1 - name == name_len && *end == 'c')) + if (!errno && (end + 1 - name == name_len && *end == 'c')) return av_get_default_channel_layout(i); + errno = 0; layout = strtoll(name, &end, 0); - if (end - name == name_len) + if (!errno && end - name == name_len) return FFMAX(layout, 0); return 0; } |