xserver: Branch 'master'

[Adam Jackson]

 render/picture.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c7f84c880bbbb508016ad80390a11961b1c4214d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jan 27 09:44:48 2014 +0000

    render: Fix leak of filter params
    
    ==11097== 2,048 (+1,640) bytes in 32 (+26) blocks are definitely lost in loss record 1,570 of 1,719
    ==11097==    at 0x4C2A2DB: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
    ==11097==    by 0x225EF3: SetPicturePictFilter (filter.c:339)
    ==11097==    by 0x22DF4F: ProcRenderSetPictureFilter (render.c:1773)
    ==11097==    by 0x15D25D: Dispatch (dispatch.c:432)
    ==11097==    by 0x14C7B9: main (main.c:298)
    
    [ajax: Fixed whitespace]
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/render/picture.c b/render/picture.c
index acdd0ae..3d52dec 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1398,6 +1398,7 @@ FreePicture(void *value, XID pid)
 
     if (--pPicture->refcnt == 0) {
         free(pPicture->transform);
+        free(pPicture->filter_params);
 
         if (pPicture->pSourcePict) {
             if (pPicture->pSourcePict->type != SourcePictTypeSolidFill)