diff options
| author | Tomas Härdin <tomas.hardin@codemill.se> | 2012-09-07 13:28:48 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-09-12 14:31:09 +0200 |
| commit | 5e3572893d7f17679c5e051c511bf42f3da77b00 (patch) | |
| tree | 7b0da0772b27c507d138aeb52c7f043882392916 | |
| parent | c3bcd22ed3f843f7240fa190df8f3daa2081290f (diff) | |
| download | ffmpeg-5e3572893d7f17679c5e051c511bf42f3da77b00.tar.gz | |
img2dec: always close AVIOContexts
Zero sized files would cause the contexts to leak away.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/img2dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 2f5092f457..1151180b22 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -216,7 +216,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) char filename[1024]; int i; int size[3]={0}, ret[3]={0}; - AVIOContext *f[3]; + AVIOContext *f[3] = {NULL}; AVCodecContext *codec= s1->streams[0]->codec; if (!s->is_pipe) { @@ -232,7 +232,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) for(i=0; i<3; i++){ if (avio_open2(&f[i], filename, AVIO_FLAG_READ, &s1->interrupt_callback, NULL) < 0) { - if(i==1) + if(i>=1) break; av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename); return AVERROR(EIO); @@ -259,7 +259,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) pkt->size= 0; for(i=0; i<3; i++){ - if(size[i]){ + if(f[i]){ ret[i]= avio_read(f[i], pkt->data + pkt->size, size[i]); if (!s->is_pipe) avio_close(f[i]); |