[FFmpeg-devel] [PATCH v2] libavformat/asfdec: Fix regression bug when reading image attachments

Carl Eugen Hoyos ceffmpeg at gmail.com
Sun Aug 8 02:57:56 EEST 2021


Am So., 8. Aug. 2021 um 01:53 Uhr schrieb Soft Works <softworkz at hotmail.com>:
>
> Commit c8140fe7324f264faacf7395b27e12531d1f13f7 had introduced a check for value_len > UINT16_MAX.
> As a consequence, attached images of sizes larger than UINT16_MAX could no longer be read.
>
> Signed-off-by: softworkz <softworkz at hotmail.com>
> ---
> v2: Fix without changing variable type
>  libavformat/asfdec_f.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
> index ff6ddfb967..b9f3918495 100644
> --- a/libavformat/asfdec_f.c
> +++ b/libavformat/asfdec_f.c
> @@ -614,7 +614,7 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size)
>          value_type = avio_rl16(pb); /* value_type */
>          value_len  = avio_rl32(pb);
>
> -        if (value_len < 0 || value_len > UINT16_MAX)
> +        if (value_len < 0)
>              return AVERROR_INVALIDDATA;

I may misread the code but it appears to me that an assert
can be triggered now, no?

Carl Eugen


More information about the ffmpeg-devel mailing list