virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/av1_parse: Use av_fast_realloc() for OBU array

Browse Source 
Based on commits 22bec0d33f and
cebb446911.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-10-14 23:42:01 -03:00
parent 1e0b6bc0b4
commit 62f4722582
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/av1_parse.c
View File

@ -66,7 +66,11 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo
if (pkt->obus_allocated < pkt->nb_obus + 1) { if (pkt->obus_allocated < pkt->nb_obus + 1) {
int new_size = pkt->obus_allocated + 1; int new_size = pkt->obus_allocated + 1;
AV1OBU *tmp = av_realloc_array(pkt->obus, new_size, sizeof(*tmp)); AV1OBU *tmp;
if (new_size >= INT_MAX / sizeof(*tmp))
return AVERROR(ENOMEM);
tmp = av_fast_realloc(pkt->obus, &pkt->obus_allocated_size, new_size * sizeof(*tmp));
if (!tmp) if (!tmp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -102,5 +106,5 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo
void ff_av1_packet_uninit(AV1Packet *pkt) void ff_av1_packet_uninit(AV1Packet *pkt)
{ {
av_freep(&pkt->obus); av_freep(&pkt->obus);
pkt->obus_allocated = 0; pkt->obus_allocated = pkt->obus_allocated_size = 0;
} }

1
libavcodec/av1_parse.h
View File

@ -56,6 +56,7 @@ typedef struct AV1Packet {
AV1OBU *obus; AV1OBU *obus;
int nb_obus; int nb_obus;
int obus_allocated; int obus_allocated;
unsigned obus_allocated_size;
} AV1Packet; } AV1Packet;
/** /**