avformat/mov: Don't allow negative sample sizes.

[ffmpeg] / libavformat / adxdec.c

diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c
index a271e2afa80a7e8ca08878c5a373ac98ed7d220c..ccd5049acd0454301031f251ebf4ec1976886f89 100644 (file)
--- a/libavformat/adxdec.c
+++ b/libavformat/adxdec.c
@@ -34,7 +34,7 @@ typedef struct ADXDemuxerContext {
     int header_size;
 } ADXDemuxerContext;
 
-static int adx_probe(AVProbeData *p)
+static int adx_probe(const AVProbeData *p)
 {
     int offset;
     if (AV_RB16(p->buf) != 0x8000)
@@ -65,11 +65,9 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     ret = av_get_packet(s->pb, pkt, size);
     if (ret != size) {
-        av_packet_unref(pkt);
         return ret < 0 ? ret : AVERROR(EIO);
     }
     if (AV_RB16(pkt->data) & 0x8000) {
-        av_packet_unref(pkt);
         return AVERROR_EOF;
     }
     pkt->size     = size;
@@ -83,7 +81,7 @@ static int adx_read_header(AVFormatContext *s)
 {
     ADXDemuxerContext *c = s->priv_data;
     AVCodecParameters *par;
-
+    int ret;
     AVStream *st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
@@ -94,8 +92,8 @@ static int adx_read_header(AVFormatContext *s)
     c->header_size = avio_rb16(s->pb) + 4;
     avio_seek(s->pb, -4, SEEK_CUR);
 
-    if (ff_get_extradata(s, par, s->pb, c->header_size) < 0)
-        return AVERROR(ENOMEM);
+    if ((ret = ff_get_extradata(s, par, s->pb, c->header_size)) < 0)
+        return ret;
 
     if (par->extradata_size < 12) {
         av_log(s, AV_LOG_ERROR, "Invalid extradata size.\n");