[FFmpeg-cvslog] imgutils: Fix illegal read.

[Thierry Foucu]

ffmpeg | branch: release/0.7 | Thierry Foucu <tfoucu at gmail.com> | Fri Nov 18 17:36:50 2011 -0800| [28acce2861a07b6b78204a2cbc90bbdeed285405] | committer: Reinhard Tartler

imgutils: Fix illegal read.

Found with address sanitizer.

Signed-off-by: Alex Converse <alex.converse at gmail.com>
(cherry picked from commit c693aa6f71b4f539cf9df67ba42f4b1932981687)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

 libavutil/imgutils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 46853ca..9dc4f01 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -117,7 +117,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh
         has_plane[desc->comp[i].plane] = 1;
 
     total_size = size[0];
-    for (i = 1; has_plane[i] && i < 4; i++) {
+    for (i = 1; i < 4 && has_plane[i]; i++) {
         int h, s = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
         data[i] = data[i-1] + size[i-1];
         h = (height + (1 << s) - 1) >> s;