From c693aa6f71b4f539cf9df67ba42f4b1932981687 Mon Sep 17 00:00:00 2001 From: Thierry Foucu Date: Fri, 18 Nov 2011 17:36:50 -0800 Subject: imgutils: Fix illegal read. Found with address sanitizer. Signed-off-by: Alex Converse --- libavutil/imgutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavutil/imgutils.c') diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 5cd71e21ce..b734db7bb1 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -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; -- cgit v1.2.3