har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/detection_bbox: Fix av_detection_bbox_alloc failed if nb_bboxes == 0

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2021-09-25 10:27:10 +08:00
parent e724004fd8
commit 9997047a18
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavutil/detection_bbox.c
View File

@ -23,27 +23,29 @@ AVDetectionBBoxHeader *av_detection_bbox_alloc(uint32_t nb_bboxes, size_t *out_s
size_t size; size_t size;
struct BBoxContext { struct BBoxContext {
AVDetectionBBoxHeader header; AVDetectionBBoxHeader header;
AVDetectionBBox boxes[1]; AVDetectionBBox boxes;
} *ret; };
const size_t bboxes_offset = offsetof(struct BBoxContext, boxes); const size_t bboxes_offset = offsetof(struct BBoxContext, boxes);
const size_t bbox_size = sizeof(AVDetectionBBox);
AVDetectionBBoxHeader *header;
size = sizeof(*ret); size = bboxes_offset;
if (nb_bboxes - 1 > (SIZE_MAX - size) / sizeof(*ret->boxes)) if (nb_bboxes > (SIZE_MAX - size) / bbox_size)
return NULL; return NULL;
size += sizeof(*ret->boxes) * (nb_bboxes - 1); size += bbox_size * nb_bboxes;
ret = av_mallocz(size); header = av_mallocz(size);
if (!ret) if (!header)
return NULL; return NULL;
ret->header.nb_bboxes = nb_bboxes; header->nb_bboxes = nb_bboxes;
ret->header.bbox_size = sizeof(*ret->boxes); header->bbox_size = bbox_size;
ret->header.bboxes_offset = bboxes_offset; header->bboxes_offset = bboxes_offset;
if (out_size) if (out_size)
*out_size = size; *out_size = size;
return &ret->header; return header;
} }
AVDetectionBBoxHeader *av_detection_bbox_create_side_data(AVFrame *frame, uint32_t nb_bboxes) AVDetectionBBoxHeader *av_detection_bbox_create_side_data(AVFrame *frame, uint32_t nb_bboxes)