[FFmpeg-cvslog] avformat/fitsenc: validate input pixel format

Timo Rothenpieler git at videolan.org
Mon Nov 13 21:49:20 EET 2017


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Wed Nov  8 19:17:49 2017 +0100| [284b432662b6e137148ff9d13ef2b554cb14b4ae] | committer: Timo Rothenpieler

avformat/fitsenc: validate input pixel format

Fixes CID #1416961 and #1416962

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=284b432662b6e137148ff9d13ef2b554cb14b4ae
---

 libavformat/fitsenc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/fitsenc.c b/libavformat/fitsenc.c
index 7cb171596c..cc3999aa8a 100644
--- a/libavformat/fitsenc.c
+++ b/libavformat/fitsenc.c
@@ -106,6 +106,8 @@ static int write_image_header(AVFormatContext *s)
             }
             bzero = 32768;
             break;
+        default:
+            return AVERROR(EINVAL);
     }
 
     if (fitsctx->first_image) {
@@ -166,7 +168,9 @@ static int write_image_header(AVFormatContext *s)
 
 static int fits_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    write_image_header(s);
+    int ret = write_image_header(s);
+    if (ret < 0)
+        return ret;
     avio_write(s->pb, pkt->data, pkt->size);
     return 0;
 }



More information about the ffmpeg-cvslog mailing list