xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_vbo.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b9a9b244336ed50d7df4f36135f875a3bb6ca948
Author: Thomas DeRensis <tderensis at gmail.com>
Date:   Thu Sep 4 21:45:19 2014 -0400

    radeon: fix a leak in radeon_vbo_get_bo()
    
    The dma_bo struct was never freed in the error path. Reported by cppcheck.
    
    Signed-off-by: Thomas DeRensis <tderensis at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_vbo.c b/src/radeon_vbo.c
index 1924772..6b0d278 100644
--- a/src/radeon_vbo.c
+++ b/src/radeon_vbo.c
@@ -185,6 +185,7 @@ again_alloc:
 
 	if (!dma_bo->bo) {
 	    ErrorF("failure to allocate DMA BO\n");
+	    free(dma_bo);
 	    return NULL;
 	}
 	insert_at_head(&accel_state->bo_reserved, dma_bo);