virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_dec: Use av_fast_padded_malloc where appropriate

Browse Source 
Will probably also fix Coverity issue #1473529.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-07-31 12:08:49 +02:00
parent 2d7c1479c2
commit 27a9e1ce22
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/mpegvideo_dec.c
View File

@ -154,21 +154,16 @@ do {\
s->divx_packed = s1->divx_packed; s->divx_packed = s1->divx_packed;
if (s1->bitstream_buffer) { if (s1->bitstream_buffer) {
if (s1->bitstream_buffer_size + av_fast_padded_malloc(&s->bitstream_buffer,
AV_INPUT_BUFFER_PADDING_SIZE > s->allocated_bitstream_buffer_size) { &s->allocated_bitstream_buffer_size,
av_fast_malloc(&s->bitstream_buffer, s1->bitstream_buffer_size);
&s->allocated_bitstream_buffer_size, if (!s->bitstream_buffer) {
s1->allocated_bitstream_buffer_size); s->bitstream_buffer_size = 0;
if (!s->bitstream_buffer) { return AVERROR(ENOMEM);
s->bitstream_buffer_size = 0;
return AVERROR(ENOMEM);
}
} }
s->bitstream_buffer_size = s1->bitstream_buffer_size; s->bitstream_buffer_size = s1->bitstream_buffer_size;
memcpy(s->bitstream_buffer, s1->bitstream_buffer, memcpy(s->bitstream_buffer, s1->bitstream_buffer,
s1->bitstream_buffer_size); s1->bitstream_buffer_size);
memset(s->bitstream_buffer + s->bitstream_buffer_size, 0,
AV_INPUT_BUFFER_PADDING_SIZE);
} }
// linesize-dependent scratch buffer allocation // linesize-dependent scratch buffer allocation