pixman: Branch 'master'

[Aaron Plattner]

 pixman/pixman-access.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d32519316b40b35113c6df9e15d955a16709ba2
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Fri Jun 13 09:52:53 2008 -0700

    Use pixman_malloc_ab instead of plain malloc for the fbStore64_generic scratch buffer.

diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index ec187d3..ca9619c 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -1857,7 +1857,7 @@ fbStore64_generic (pixman_image_t *image,
     assert(image->common.type == BITS);
     assert(store32);
 
-    argb8Pixels = malloc(sizeof(uint32_t) * width);
+    argb8Pixels = pixman_malloc_ab (width, sizeof(uint32_t));
     if (!argb8Pixels) return;
 
     // Contract the scanline.  We could do this in place if values weren't