pixman: Branch 'master'

[Søren Sandmann Pedersen]

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

New commits:
commit 02906e57bd801e20b3094ca348fad563c6b5a922
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Wed Aug 28 00:38:22 2013 -0400

    fast_bilinear_cover_init: Don't install a finalizer on the error path
    
    No memory is allocated in the error case, so a finalizer is not
    necessary, and will cause problems if the data pointer is not
    initialized to NULL.

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 2608268..5d52b4a 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -2489,7 +2489,7 @@ fail:
 	FUNC, "Allocation failure or bad matrix, skipping rendering\n");
     
     iter->get_scanline = _pixman_iter_get_scanline_noop;
-    iter->fini = bilinear_cover_iter_fini;
+    iter->fini = NULL;
 }
 
 #define IMAGE_FLAGS							\