1. ffmpeg
  2. Commit 4007352bd054936fe06cb8b726db008b47101d91
Browse code

imgutils: Fix illegal read.

Found with address sanitizer.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Thierry Foucu authored on 2011/11/19 10:36:50
Showing 1 changed files
libavutil/imgutils.c
History View file @ 4007352
... ... 
@@ -125,7 +125,7 @@ int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh
125 125 
         has_plane[desc->comp[i].plane] = 1;
126 126
127 127 
     total_size = size[0];
128 
-    for (i = 1; has_plane[i] && i < 4; i++) {
128 
+    for (i = 1; i < 4 && has_plane[i]; i++) {
129 129 
         int h, s = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
130 130 
         data[i] = data[i-1] + size[i-1];
131 131 
         h = (height + (1 << s) - 1) >> s;