summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2012-03-15 11:37:26 -0400
committerZack Rusin <zackr@vmware.com>2012-03-15 16:54:54 -0400
commitb70116b907aa8545f0275589a52275235083bb40 (patch)
tree5a43fc3c529c6ade9f538ffd30a6ae6da1be8db1
parent57f1204292a116b35d5930752bc06f9065332879 (diff)
downloadxf86-video-vmware-b70116b907aa8545f0275589a52275235083bb40.tar.gz
xf86-video-vmware-b70116b907aa8545f0275589a52275235083bb40.tar.bz2
xf86-video-vmware-b70116b907aa8545f0275589a52275235083bb40.zip
Fix a memory corruption due to a redundant free.
We use the empty rect purely as a placeholder and never initialize it with its own memory so lets not try to free it. Spotted by Dave Airlie. Signed-off-by: Zack Rusin <zackr@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-rw-r--r--vmwgfx/vmwgfx_saa.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index 0a6b98f..469598a 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -1151,11 +1151,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
if (xa_composite_prepare(vsaa->xa_ctx, xa_comp))
goto out_err;
- REGION_UNINIT(pScreen, &empty);
return TRUE;
out_err:
- REGION_UNINIT(pScreen, &empty);
return FALSE;
}