RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/jpegxl_probe: Forward error codes 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-06-08 10:26:35 -04:00 committed by Leo Izen
parent 1ec4553e35
commit 09621fd7d9
No known key found for this signature in database
GPG Key ID: 5A71C331FD2FA19A
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/jpegxl_probe.c
View File

@ -261,8 +261,8 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid
if (get_bits_long(gb, 16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE) if (get_bits_long(gb, 16) != FF_JPEGXL_CODESTREAM_SIGNATURE_LE)
return -1; return -1;
if (jpegxl_read_size_header(gb) < 0 && validate_level) if ((ret = jpegxl_read_size_header(gb)) < 0 && validate_level)
return -1; return ret;
all_default = get_bits1(gb); all_default = get_bits1(gb);
if (!all_default) if (!all_default)
@ -281,8 +281,9 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid
/* preview header */ /* preview header */
if (get_bits1(gb)) { if (get_bits1(gb)) {
if (jpegxl_read_preview_header(gb) < 0) ret = jpegxl_read_preview_header(gb);
return -1; if (ret < 0)
return ret;
} }
/* animation header */ /* animation header */
@ -308,8 +309,9 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen, int valid
if (num_extra_channels > 4 && validate_level) if (num_extra_channels > 4 && validate_level)
return -1; return -1;
for (uint32_t i = 0; i < num_extra_channels; i++) { for (uint32_t i = 0; i < num_extra_channels; i++) {
if (jpegxl_read_extra_channel_info(gb, validate_level) < 0) ret = jpegxl_read_extra_channel_info(gb, validate_level);
return -1; if (ret < 0)
return ret;
if (get_bits_left(gb) < 1) if (get_bits_left(gb) < 1)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }