Signed-off-by: Michael Niedermayer <[email protected]>
---
libavformat/icodec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/icodec.c b/libavformat/icodec.c
index c061f3ec42..cf1e60815e 100644
--- a/libavformat/icodec.c
+++ b/libavformat/icodec.c
@@ -113,8 +113,7 @@ static int read_header(AVFormatContext *s)
ico->images[i].size = avio_rl32(pb);
if (ico->images[i].size <= 0) {
av_log(s, AV_LOG_ERROR, "Invalid image size %d\n",
ico->images[i].size);
- av_freep(&ico->images);
- return AVERROR_INVALIDDATA;
+ goto fail;
}
ico->images[i].offset = avio_rl32(pb);
@@ -130,8 +129,7 @@ static int read_header(AVFormatContext *s)
break;
case 40:
if (ico->images[i].size < 40) {
- av_freep(&ico->images);
- return AVERROR_INVALIDDATA;
+ goto fail;
}
st->codecpar->codec_id = AV_CODEC_ID_BMP;
tmp = avio_rl32(pb);
@@ -143,12 +141,14 @@ static int read_header(AVFormatContext *s)
break;
default:
avpriv_request_sample(s, "codec %d", codec);
- av_freep(&ico->images);
- return AVERROR_INVALIDDATA;
+ goto fail;
}
}
return 0;
+fail:
+ av_freep(&ico->images);
+ return AVERROR_INVALIDDATA;
}
static int read_packet(AVFormatContext *s, AVPacket *pkt)
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
