Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

[ffmpeg] / libavcodec / targa.c

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 11a8f213fd6bb100cdd82ad242c967fe03c45a43..2d1d3dfb13c740c18970a2ba14523cf6bf29d2de 100644 (file)
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -40,7 +40,7 @@ static uint8_t *advance_line(uint8_t *start, uint8_t *line,
         return line + interleave * stride;
     } else {
         *y = (*y + 1) & (interleave - 1);
-        if (*y) {
+        if (*y && *y < h) {
             return start + *y * stride;
         } else {
             return NULL;