[FFmpeg-cvslog] tiffenc: Check av_pix_fmt_desc_get() return value

Vittorio Giovara git at videolan.org
Mon Nov 14 13:35:17 EET 2016


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Sun Jun 26 20:08:55 2016 -0400| [9f732e4c996243c1e57c2bbbec6c8b94c37a7a22] | committer: Vittorio Giovara

tiffenc: Check av_pix_fmt_desc_get() return value

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

 libavcodec/tiffenc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 7c23ee2..24312f0 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -254,7 +254,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     case AV_PIX_FMT_RGB24:
     case AV_PIX_FMT_GRAY8:
     case AV_PIX_FMT_PAL8:
-        pfd    = av_pix_fmt_desc_get(avctx->pix_fmt);
+        pfd = av_pix_fmt_desc_get(avctx->pix_fmt);
+        if (!pfd)
+            return AVERROR_BUG;
         s->bpp = av_get_bits_per_pixel(pfd);
         if (pfd->flags & AV_PIX_FMT_FLAG_PAL)
             s->photometric_interpretation = TIFF_PHOTOMETRIC_PALETTE;



More information about the ffmpeg-cvslog mailing list