MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu/video_enc_params: make sure blocks are properly aligned

This commit is contained in:
Anton Khirnov 2021-04-08 11:16:06 +02:00
parent 1256b71ba9
commit c8778606b3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/video_enc_params.c
View File

@ -29,10 +29,14 @@
AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
unsigned int nb_blocks, size_t *out_size)
{
const size_t blocks_offset = offsetof(
struct {
AVVideoEncParams p;
AVVideoBlockParams b;
}, b);
size_t size = blocks_offset;
AVVideoEncParams *par;
size_t size;
size = sizeof(*par);
if (nb_blocks > (SIZE_MAX - size) / sizeof(AVVideoBlockParams))
return NULL;
size += sizeof(AVVideoBlockParams) * nb_blocks;
@ -44,7 +48,7 @@ AVVideoEncParams *av_video_enc_params_alloc(enum AVVideoEncParamsType type,
par->type = type;
par->nb_blocks = nb_blocks;
par->block_size = sizeof(AVVideoBlockParams);
par->blocks_offset = sizeof(*par);
par->blocks_offset = blocks_offset;
if (out_size)
*out_size = size;