[FFmpeg-cvslog] avcodec/crystalhd: Handle errors from av_image_get_linesize

[Philip Langdale]

ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Wed Nov 30 16:03:44 2016 -0800| [5512dbe37f83d8b11393c7059c6eae48d164461c] | committer: Philip Langdale

avcodec/crystalhd: Handle errors from av_image_get_linesize

This function can return an error in certain situations.

Fixes Coverity CID 703707.

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

 libavcodec/crystalhd.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
index d85e351..630d02b 100644
--- a/libavcodec/crystalhd.c
+++ b/libavcodec/crystalhd.c
@@ -568,6 +568,9 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
     }
 
     bwidth = av_image_get_linesize(avctx->pix_fmt, width, 0);
+    if (bwidth < 0)
+       return RET_ERROR;
+
     if (priv->is_70012) {
         int pStride;
 
@@ -577,6 +580,8 @@ static inline CopyRet copy_frame(AVCodecContext *avctx,
             pStride = 1280;
         else pStride = 1920;
         sStride = av_image_get_linesize(avctx->pix_fmt, pStride, 0);
+        if (sStride < 0)
+            return RET_ERROR;
     } else {
         sStride = bwidth;
     }