generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avpacket: free side data in av_free_packet().

Browse Source 
Freeing it in av_destruct_packet(), as is done currently, would mean
that we allow it to be allocated with other means. But that would make
av_packet_new_side_data() unsafe.

Side data is not expected to be large, so copying it if required
shouldn't be a problem.
This commit is contained in:
Anton Khirnov 2012-10-31 06:42:08 +01:00
parent 49dc82eef7
commit 90cfc084e3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/avpacket.c
View File

@ -27,16 +27,9 @@
void av_destruct_packet(AVPacket *pkt) void av_destruct_packet(AVPacket *pkt)
{ {
int i;
av_free(pkt->data); av_free(pkt->data);
pkt->data = NULL; pkt->data = NULL;
pkt->size = 0; pkt->size = 0;
for (i = 0; i < pkt->side_data_elems; i++)
av_free(pkt->side_data[i].data);
av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
} }
void av_init_packet(AVPacket *pkt) void av_init_packet(AVPacket *pkt)
@ -153,11 +146,16 @@ failed_alloc:
void av_free_packet(AVPacket *pkt) void av_free_packet(AVPacket *pkt)
{ {
if (pkt) { if (pkt) {
int i;
if (pkt->destruct) if (pkt->destruct)
pkt->destruct(pkt); pkt->destruct(pkt);
pkt->data = NULL; pkt->data = NULL;
pkt->size = 0; pkt->size = 0;
pkt->side_data = NULL;
for (i = 0; i < pkt->side_data_elems; i++)
av_free(pkt->side_data[i].data);
av_freep(&pkt->side_data);
pkt->side_data_elems = 0; pkt->side_data_elems = 0;
} }
} }