From 869ee7f232d2afcf2c08003e4f279e21b58b9581 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 27 Nov 2009 20:57:59 -0500 Subject: [PATCH] Allocate a large-enough and mask We came up short when the image width is not a multiple of 8. Bug 585383, fix by Felix Riemann. --- gdk-pixbuf/io-ico.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index 4a6bad8703..e7fedb9295 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -1011,12 +1011,12 @@ fill_entry (IconEntry *icon, return FALSE; } - if ((icon->xor_rowstride % 4) != 0) + if ((icon->xor_rowstride % 4) != 0) icon->xor_rowstride = 4 * ((icon->xor_rowstride / 4) + 1); icon->xor = g_new0 (guchar, icon->xor_rowstride * icon->height); - icon->and_rowstride = icon->width / 8; - if ((icon->and_rowstride % 4) != 0) + icon->and_rowstride = (icon->width + 7) / 8; + if ((icon->and_rowstride % 4) != 0) icon->and_rowstride = 4 * ((icon->and_rowstride / 4) + 1); icon->and = g_new0 (guchar, icon->and_rowstride * icon->height);