By checking immediately whether the first allocation was successfull
one can simplify the cleanup code in case of errors.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
libavcodec/pngdec.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 21e79a24a7..813f16692c 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -539,12 +539,13 @@ static int decode_text_chunk(PNGDecContext *s, uint32_t
length, int compressed,
text_len = data_end - data;
}
- kw_utf8 = iso88591_to_utf8(keyword, keyword_end - keyword);
txt_utf8 = iso88591_to_utf8(data, text_len);
if (compressed)
av_bprint_finalize(&bp, NULL);
- if (!(kw_utf8 && txt_utf8)) {
- av_free(kw_utf8);
+ if (!txt_utf8)
+ return AVERROR(ENOMEM);
+ kw_utf8 = iso88591_to_utf8(keyword, keyword_end - keyword);
+ if (!kw_utf8) {
av_free(txt_utf8);
return AVERROR(ENOMEM);
}
--
2.27.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
