On Sun, Sep 29, 2013 at 01:21:06AM +0300, Martin Storsjö wrote:
> Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
> CC: libav-sta...@libav.org
> ---
> Alternatively, we could require bits_per_coded_sample to be >= 8
> earlier as well, although that could rule out some (purely
> hypothetical?) formats with 2 channels with bits_per_coded_sample == 4.
> ---
> libavformat/xwma.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/libavformat/xwma.c b/libavformat/xwma.c
> index 52e423c..f4ff815 100644
> --- a/libavformat/xwma.c
> +++ b/libavformat/xwma.c
> @@ -198,6 +198,14 @@ static int xwma_read_header(AVFormatContext *s)
>
> /* Estimate the duration from the total number of output bytes. */
> const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1];
> +
> + if (!bytes_per_sample) {
> + av_log(s, AV_LOG_ERROR,
> + "Invalid bits_per_coded_sample %d for %d channels\n",
> + st->codec->bits_per_coded_sample, st->codec->channels);
> + return AVERROR_INVALIDDATA;
> + }
> +
> st->duration = total_decoded_bytes / bytes_per_sample;
>
> /* Use the dpds data to build a seek table. We can only do this
> after
> --
might be OK
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
