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

avcodec/jpegxl_parser: fix parsing sequences of extremely small files 

This patch allows the JXL parser to parse sequences of extremely small
files concatenated together. (e.g. smaller than the parser buffer)

Signed-off-by: Leo Izen <leo.izen@gmail.com>
This commit is contained in:
Leo Izen 2023-11-27 09:10:07 -05:00
parent 019b3ea65a
commit c4be080e65
No known key found for this signature in database
GPG Key ID: 5A71C331FD2FA19A
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/jpegxl_parser.c
View File

@ -1454,15 +1454,21 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx,
{ {
JXLParseContext *ctx = s->priv_data; JXLParseContext *ctx = s->priv_data;
int next = END_NOT_FOUND, ret; int next = END_NOT_FOUND, ret;
const uint8_t *pbuf = ctx->pc.buffer;
int pindex = ctx->pc.index;
*poutbuf_size = 0; *poutbuf_size = 0;
*poutbuf = NULL; *poutbuf = NULL;
if (!ctx->pc.index) if (!ctx->pc.index) {
goto flush; if (ctx->pc.overread)
goto flush;
pbuf = buf;
pindex = buf_size;
}
if ((!ctx->container || !ctx->codestream_length) && !ctx->next) { if ((!ctx->container || !ctx->codestream_length) && !ctx->next) {
ret = try_parse(s, avctx, ctx, ctx->pc.buffer, ctx->pc.index); ret = try_parse(s, avctx, ctx, pbuf, pindex);
if (ret < 0) if (ret < 0)
goto flush; goto flush;
ctx->next = ret; ctx->next = ret;
@ -1471,7 +1477,7 @@ static int jpegxl_parse(AVCodecParserContext *s, AVCodecContext *avctx,
} }
if (ctx->container && ctx->next >= 0) { if (ctx->container && ctx->next >= 0) {
ret = skip_boxes(ctx, ctx->pc.buffer, ctx->pc.index); ret = skip_boxes(ctx, pbuf, pindex);
if (ret < 0) { if (ret < 0) {
if (ret == AVERROR_INVALIDDATA) if (ret == AVERROR_INVALIDDATA)
ctx->next = -1; ctx->next = -1;