imgutils: Fix illegal read.
authorThierry Foucu <tfoucu@gmail.com>
Sat, 19 Nov 2011 01:36:50 +0000 (17:36 -0800)
committerAlex Converse <alex.converse@gmail.com>
Sat, 19 Nov 2011 01:42:49 +0000 (17:42 -0800)
Found with address sanitizer.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
libavutil/imgutils.c

index 5cd71e2..b734db7 100644 (file)
@@ -118,7 +118,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;