Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for n3.2.6 #441

Open
wants to merge 13 commits into
base: origin-n3.2.6-1733760375
Choose a base branch
from
Open

Patch for n3.2.6 #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0f1eb23
commit patch 19381892
Dec 9, 2024
c2a8958
commit patch 18622210
Dec 9, 2024
dafc656
commit patch 23035798
Dec 9, 2024
656eb99
commit patch 18622211
Dec 9, 2024
dad4fa2
commit patch 22783140
Dec 9, 2024
aaae734
commit patch 26397029
Dec 9, 2024
d079469
commit patch 24557399
Dec 9, 2024
f86a94e
commit patch 18558903
Dec 9, 2024
fa2e1c1
commit patch 27983284
Dec 9, 2024
a915fd9
commit patch 22530026
Dec 9, 2024
3e4d772
commit patch 20711574
Dec 9, 2024
c34b016
commit patch 22001740
Dec 9, 2024
391fa80
commit patch 25381687
Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions libavcodec/apedec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,6 +1412,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
int32_t *sample24;
int i, ch, ret;
int blockstodecode;
uint64_t decoded_buffer_size;

/* this should never be negative, but bad things will happen if it is, so
check it just to make sure. */
Expand Down Expand Up @@ -1467,7 +1468,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
skip_bits_long(&s->gb, offset);
}

if (!nblocks || nblocks > INT_MAX) {
if (!nblocks || nblocks > INT_MAX / 2 / sizeof(*s->decoded_buffer) - 8) {
av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %"PRIu32".\n",
nblocks);
return AVERROR_INVALIDDATA;
Expand All @@ -1493,8 +1494,9 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
blockstodecode = s->samples;

/* reallocate decoded sample buffer if needed */
av_fast_malloc(&s->decoded_buffer, &s->decoded_size,
2 * FFALIGN(blockstodecode, 8) * sizeof(*s->decoded_buffer));
decoded_buffer_size = 2LL * FFALIGN(blockstodecode, 8) * sizeof(*s->decoded_buffer);
av_assert0(decoded_buffer_size <= INT_MAX);
av_fast_malloc(&s->decoded_buffer, &s->decoded_size, decoded_buffer_size);
if (!s->decoded_buffer)
return AVERROR(ENOMEM);
memset(s->decoded_buffer, 0, s->decoded_size);
Expand Down
Loading