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

Fix memleak caused by the fact that url_open_buf() allocates a context

Browse Source 
when calling, but url_close_buf() doesn't free it. The better solution
is to not allocate it at all, init it with init_put_byte() and then
not have to close it at all. In the case where we do need to hold it
around for longer than within the function context, we allocate it with
av_alloc_put_byte() and free it with av_free() instead. Discussed in ML
thread "[PATCH] fix small memleak in rdt.c".

Originally committed as revision 15850 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2008-11-17 14:23:20 +00:00
parent fcc995a533
commit a4b8cb3c55
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavformat/rdt.c
View File

@ -115,7 +115,7 @@ ff_rdt_calc_response_and_checksum(char response[41], char chksum[9],
static int static int
rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr) rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
{ {
ByteIOContext *pb; ByteIOContext pb;
int size; int size;
uint32_t tag; uint32_t tag;
@ -135,34 +135,34 @@ rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
*/ */
if (!rdt->mlti_data) if (!rdt->mlti_data)
return -1; return -1;
url_open_buf(&pb, rdt->mlti_data, rdt->mlti_data_size, URL_RDONLY); init_put_byte(&pb, rdt->mlti_data, rdt->mlti_data_size, 0,
tag = get_le32(pb); NULL, NULL, NULL, NULL);
tag = get_le32(&pb);
if (tag == MKTAG('M', 'L', 'T', 'I')) { if (tag == MKTAG('M', 'L', 'T', 'I')) {
int num, chunk_nr; int num, chunk_nr;
/* read index of MDPR chunk numbers */ /* read index of MDPR chunk numbers */
num = get_be16(pb); num = get_be16(&pb);
if (rule_nr < 0 || rule_nr >= num) if (rule_nr < 0 || rule_nr >= num)
return -1; return -1;
url_fskip(pb, rule_nr * 2); url_fskip(&pb, rule_nr * 2);
chunk_nr = get_be16(pb); chunk_nr = get_be16(&pb);
url_fskip(pb, (num - 1 - rule_nr) * 2); url_fskip(&pb, (num - 1 - rule_nr) * 2);
/* read MDPR chunks */ /* read MDPR chunks */
num = get_be16(pb); num = get_be16(&pb);
if (chunk_nr >= num) if (chunk_nr >= num)
return -1; return -1;
while (chunk_nr--) while (chunk_nr--)
url_fskip(pb, get_be32(pb)); url_fskip(&pb, get_be32(&pb));
size = get_be32(pb); size = get_be32(&pb);
} else { } else {
size = rdt->mlti_data_size; size = rdt->mlti_data_size;
url_fseek(pb, 0, SEEK_SET); url_fseek(&pb, 0, SEEK_SET);
} }
if (ff_rm_read_mdpr_codecdata(rdt->rmctx, pb, st, size) < 0) if (ff_rm_read_mdpr_codecdata(rdt->rmctx, &pb, st, size) < 0)
return -1; return -1;
url_close_buf(pb);
return 0; return 0;
} }
@ -258,30 +258,30 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st,
const uint8_t *buf, int len, int flags) const uint8_t *buf, int len, int flags)
{ {
int seq = 1, res; int seq = 1, res;
ByteIOContext *pb; ByteIOContext pb;
RMContext *rm = rdt->rmctx->priv_data; RMContext *rm = rdt->rmctx->priv_data;
if (rm->audio_pkt_cnt == 0) { if (rm->audio_pkt_cnt == 0) {
int pos; int pos;
url_open_buf (&pb, buf, len, URL_RDONLY); init_put_byte(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
flags = (flags & PKT_FLAG_KEY) ? 2 : 0; flags = (flags & PKT_FLAG_KEY) ? 2 : 0;
res = ff_rm_parse_packet (rdt->rmctx, pb, st, len, pkt, res = ff_rm_parse_packet (rdt->rmctx, &pb, st, len, pkt,
&seq, &flags, timestamp); &seq, &flags, timestamp);
pos = url_ftell(pb); pos = url_ftell(&pb);
url_close_buf (pb);
if (res < 0) if (res < 0)
return res; return res;
if (rm->audio_pkt_cnt > 0 && if (rm->audio_pkt_cnt > 0 &&
st->codec->codec_id == CODEC_ID_AAC) { st->codec->codec_id == CODEC_ID_AAC) {
memcpy (rdt->buffer, buf + pos, len - pos); memcpy (rdt->buffer, buf + pos, len - pos);
url_open_buf (&rdt->rmctx->pb, rdt->buffer, len - pos, URL_RDONLY); rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0,
NULL, NULL, NULL, NULL);
} }
} else { } else {
ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, pkt); ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb, st, pkt);
if (rm->audio_pkt_cnt == 0 && if (rm->audio_pkt_cnt == 0 &&
st->codec->codec_id == CODEC_ID_AAC) st->codec->codec_id == CODEC_ID_AAC)
url_close_buf (rdt->rmctx->pb); av_freep(&rdt->rmctx->pb);
} }
pkt->stream_index = st->index; pkt->stream_index = st->index;
pkt->pts = *timestamp; pkt->pts = *timestamp;