av_log(s, AV_LOG_ERROR, "extradata size %u too large\n", size);
return -1;
}
- if (ff_get_extradata(s, par, pb, size) < 0)
- return AVERROR(ENOMEM);
- return 0;
+ return ff_get_extradata(s, par, pb, size);
}
static void rm_read_metadata(AVFormatContext *s, AVIOContext *pb, int wide)
void ff_rm_free_rmstream (RMStream *rms)
{
+ if (!rms)
+ return;
+
av_packet_unref(&rms->pkt);
}
avio_rb16(pb); /* version2 */
avio_rb32(pb); /* header size */
flavor= avio_rb16(pb); /* add codec info / flavor */
- ast->coded_framesize = coded_framesize = avio_rb32(pb); /* coded frame size */
+ coded_framesize = avio_rb32(pb); /* coded frame size */
+ if (coded_framesize < 0)
+ return AVERROR_INVALIDDATA;
+ ast->coded_framesize = coded_framesize;
+
avio_rb32(pb); /* ??? */
bytes_per_minute = avio_rb32(pb);
if (version == 4) {
if (version == 5)
avio_r8(pb);
codecdata_length = avio_rb32(pb);
- if(codecdata_length + AV_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
+ if((unsigned)codecdata_length > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE){
av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
return -1;
}
if (version == 5)
avio_r8(pb);
codecdata_length = avio_rb32(pb);
- if(codecdata_length + AV_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
+ if((unsigned)codecdata_length > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE){
av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
return -1;
}
ast->deint_id == DEINT_ID_GENR ||
ast->deint_id == DEINT_ID_SIPR) {
if (st->codecpar->block_align <= 0 ||
- ast->audio_framesize * sub_packet_h > (unsigned)INT_MAX ||
+ ast->audio_framesize * (uint64_t)sub_packet_h > (unsigned)INT_MAX ||
ast->audio_framesize * sub_packet_h < st->codecpar->block_align)
return AVERROR_INVALIDDATA;
if (av_new_packet(&ast->pkt, ast->audio_framesize * sub_packet_h) < 0)
}
for (n = 0; n < n_pkts; n++) {
+ if (avio_feof(pb))
+ return AVERROR_INVALIDDATA;
avio_skip(pb, 2);
pts = avio_rb32(pb);
pos = avio_rb32(pb);
unsigned int data_off = 0, indx_off = 0;
char buf[128], mime[128];
int flags = 0;
- int ret = -1;
+ int ret;
unsigned size, v;
int64_t codec_pos;
avio_skip(pb, tag_size - 8);
for(;;) {
+ ret = AVERROR_INVALIDDATA;
if (avio_feof(pb))
goto fail;
tag = avio_rl32(pb);
get_str8(pb, mime, sizeof(mime)); /* mimetype */
st->codecpar->codec_type = AVMEDIA_TYPE_DATA;
st->priv_data = ff_rm_alloc_rmstream();
- if (!st->priv_data)
- return AVERROR(ENOMEM);
+ if (!st->priv_data) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
size = avio_rb32(pb);
codec_pos = avio_tell(pb);
avio_seek(pb, codec_pos + size, SEEK_SET);
} else {
avio_skip(pb, -4);
- if (ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
- size, mime) < 0)
+ ret = ff_rm_read_mdpr_codecdata(s, s->pb, st, st->priv_data,
+ size, mime);
+ if (ret < 0)
goto fail;
}
state= (state<<8) + avio_r8(pb);
if(state == MKBETAG('I', 'N', 'D', 'X')){
- int n_pkts, expected_len;
+ int n_pkts;
+ int64_t expected_len;
len = avio_rb32(pb);
avio_skip(pb, 2);
n_pkts = avio_rb32(pb);
- expected_len = 20 + n_pkts * 14;
- if (len == 20)
+ expected_len = 20 + n_pkts * 14LL;
+
+ if (len == 20 && expected_len <= INT_MAX)
/* some files don't add index entries to chunk size... */
len = expected_len;
else if (len != expected_len)
av_log(s, AV_LOG_WARNING,
- "Index size %d (%d pkts) is wrong, should be %d.\n",
+ "Index size %d (%d pkts) is wrong, should be %"PRId64".\n",
len, n_pkts, expected_len);
- len -= 14; // we already read part of the index header
- if(len<0)
+ if(len < 14)
continue;
+ len -= 14; // we already read part of the index header
goto skip;
} else if (state == MKBETAG('D','A','T','A')) {
av_log(s, AV_LOG_WARNING,
num = avio_rb16(pb);
*timestamp = avio_rb32(pb);
- mlti_id = (avio_r8(pb)>>1)-1<<16;
- mlti_id = FFMAX(mlti_id, 0);
+ mlti_id = (avio_r8(pb) >> 1) - 1;
+ mlti_id = FFMAX(mlti_id, 0) << 16;
*flags = avio_r8(pb); /* flags */
}
for(i=0;i<s->nb_streams;i++) {
return -1;
}
rm->remaining_len -= len;
- if(av_new_packet(pkt, len + 9) < 0)
- return AVERROR(EIO);
+ if ((ret = av_new_packet(pkt, len + 9)) < 0)
+ return ret;
pkt->data[0] = 0;
AV_WL32(pkt->data + 1, 1);
AV_WL32(pkt->data + 5, 0);
vst->slices = ((hdr & 0x3F) << 1) + 1;
vst->videobufsize = len2 + 8*vst->slices + 1;
av_packet_unref(&vst->pkt); //FIXME this should be output.
- if(av_new_packet(&vst->pkt, vst->videobufsize) < 0)
- return AVERROR(ENOMEM);
- memset(vst->pkt.data, 0, vst->pkt.size);
+ if ((ret = av_new_packet(&vst->pkt, vst->videobufsize)) < 0)
+ return ret;
vst->videobufpos = 8*vst->slices + 1;
vst->cur_slice = 0;
vst->curpic_num = pic_num;
if (type == 2 || vst->videobufpos == vst->videobufsize) {
vst->pkt.data[0] = vst->cur_slice-1;
- *pkt= vst->pkt;
- vst->pkt.data= NULL;
- vst->pkt.size= 0;
- vst->pkt.buf = NULL;
+ av_packet_move_ref(pkt, &vst->pkt);
if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin
memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices,
vst->videobufpos - 1 - 8*vst->slices);
- pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices);
+ av_shrink_packet(pkt, vst->videobufpos + 8*(vst->cur_slice - vst->slices));
pkt->pts = AV_NOPTS_VALUE;
pkt->pos = vst->pktpos;
vst->slices = 0;
return 0;
}
-static int rm_probe(AVProbeData *p)
+static int rm_probe(const AVProbeData *p)
{
/* check file header */
if ((p->buf[0] == '.' && p->buf[1] == 'R' &&
}
-AVInputFormat ff_rm_demuxer = {
+const AVInputFormat ff_rm_demuxer = {
.name = "rm",
.long_name = NULL_IF_CONFIG_SMALL("RealMedia"),
.priv_data_size = sizeof(RMDemuxContext),
.read_seek = rm_read_seek,
};
-AVInputFormat ff_rdt_demuxer = {
+const AVInputFormat ff_rdt_demuxer = {
.name = "rdt",
.long_name = NULL_IF_CONFIG_SMALL("RDT demuxer"),
.priv_data_size = sizeof(RMDemuxContext),
.flags = AVFMT_NOFILE,
};
-static int ivr_probe(AVProbeData *p)
+static int ivr_probe(const AVProbeData *p)
{
if (memcmp(p->buf, ".R1M\x0\x1\x1", 7) &&
memcmp(p->buf, ".REC", 4))
uint8_t key[256], val[256];
AVIOContext *pb = s->pb;
AVStream *st;
- int64_t pos, offset, temp;
+ int64_t pos, offset=0, temp;
pos = avio_tell(pb);
tag = avio_rl32(pb);
offset = temp;
temp = avio_rb64(pb);
}
+ if (offset <= 0)
+ return AVERROR_INVALIDDATA;
avio_skip(pb, offset - avio_tell(pb));
if (avio_r8(pb) != 1)
return AVERROR_INVALIDDATA;
}
for (n = 0; n < nb_streams; n++) {
- st = avformat_new_stream(s, NULL);
- if (!st)
- return AVERROR(ENOMEM);
- st->priv_data = ff_rm_alloc_rmstream();
- if (!st->priv_data)
- return AVERROR(ENOMEM);
+ if (!(st = avformat_new_stream(s, NULL)) ||
+ !(st->priv_data = ff_rm_alloc_rmstream())) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
if (avio_r8(pb) != 1)
- return AVERROR_INVALIDDATA;
+ goto invalid_data;
count = avio_rb32(pb);
for (i = 0; i < count; i++) {
if (avio_feof(pb))
- return AVERROR_INVALIDDATA;
+ goto invalid_data;
type = avio_r8(pb);
tlen = avio_rb32(pb);
} else if (type == 4 && !strncmp(key, "OpaqueData", tlen)) {
ret = ffio_ensure_seekback(pb, 4);
if (ret < 0)
- return ret;
+ goto fail;
if (avio_rb32(pb) == MKBETAG('M', 'L', 'T', 'I')) {
ret = rm_read_multi(s, pb, st, NULL);
} else {
if (avio_feof(pb))
- return AVERROR_INVALIDDATA;
+ goto invalid_data;
avio_seek(pb, -4, SEEK_CUR);
ret = ff_rm_read_mdpr_codecdata(s, pb, st, st->priv_data, len, NULL);
}
if (ret < 0)
- return ret;
+ goto fail;
} else if (type == 4) {
int j;
av_log(s, AV_LOG_DEBUG, "%s = '0x", key);
- for (j = 0; j < len; j++)
+ for (j = 0; j < len; j++) {
+ if (avio_feof(pb))
+ goto invalid_data;
av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb));
+ }
av_log(s, AV_LOG_DEBUG, "'\n");
} else if (len == 4 && type == 3 && !strncmp(key, "Duration", tlen)) {
st->duration = avio_rb32(pb);
}
if (avio_r8(pb) != 6)
- return AVERROR_INVALIDDATA;
+ goto invalid_data;
avio_skip(pb, 12);
- avio_skip(pb, avio_rb64(pb) + pos - avio_tell(s->pb));
+ avio_seek(pb, avio_rb64(pb) + pos, SEEK_SET);
if (avio_r8(pb) != 8)
- return AVERROR_INVALIDDATA;
+ goto invalid_data;
avio_skip(pb, 8);
return 0;
+invalid_data:
+ ret = AVERROR_INVALIDDATA;
+fail:
+ rm_read_close(s);
+ return ret;
}
static int ivr_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret;
}
-AVInputFormat ff_ivr_demuxer = {
+const AVInputFormat ff_ivr_demuxer = {
.name = "ivr",
.long_name = NULL_IF_CONFIG_SMALL("IVR (Internet Video Recording)"),
.priv_data_size = sizeof(RMDemuxContext),
projects / ffmpeg / blobdiff