RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

copy_packet_data: fix memleak 

This should fix gif fate memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-29 03:08:50 +02:00
parent df9117921a
commit b691bc424f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/avpacket.c
View File

@ -180,7 +180,7 @@ do { \
} while (0) } while (0)
/* Makes duplicates of data, side_data, but does not copy any other fields */ /* Makes duplicates of data, side_data, but does not copy any other fields */
static int copy_packet_data(AVPacket *pkt, AVPacket *src) static int copy_packet_data(AVPacket *pkt, AVPacket *src, int dup)
{ {
pkt->data = NULL; pkt->data = NULL;
pkt->side_data = NULL; pkt->side_data = NULL;
@ -196,8 +196,9 @@ static int copy_packet_data(AVPacket *pkt, AVPacket *src)
#if FF_API_DESTRUCT_PACKET #if FF_API_DESTRUCT_PACKET
pkt->destruct = dummy_destruct_packet; pkt->destruct = dummy_destruct_packet;
#endif #endif
if (pkt->side_data_elems && dup)
if (pkt->side_data_elems) { pkt->side_data = src->side_data;
if (pkt->side_data_elems && !dup) {
int i; int i;
DUP_DATA(pkt->side_data, src->side_data, DUP_DATA(pkt->side_data, src->side_data,
@ -228,7 +229,7 @@ int av_dup_packet(AVPacket *pkt)
#endif #endif
) { ) {
tmp_pkt = *pkt; tmp_pkt = *pkt;
return copy_packet_data(pkt, &tmp_pkt); return copy_packet_data(pkt, &tmp_pkt, 1);
} }
return 0; return 0;
} }
@ -236,7 +237,7 @@ int av_dup_packet(AVPacket *pkt)
int av_copy_packet(AVPacket *dst, AVPacket *src) int av_copy_packet(AVPacket *dst, AVPacket *src)
{ {
*dst = *src; *dst = *src;
return copy_packet_data(dst, src); return copy_packet_data(dst, src, 0);
} }
void av_free_packet(AVPacket *pkt) void av_free_packet(AVPacket *pkt)