summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2016-03-02 21:20:16 +0100
committerJulien Cristau <jcristau@debian.org>2016-03-02 21:30:17 +0100
commit2aef1f08de4e0f74436bc94301ff0fbabc1ea57b (patch)
tree70ee550ed5827745b016b1f13d7813f5232bc4fc
parentca219fe317dd10216f93fc7e06a3a6d3aa4dba0d (diff)
modesetting: avoid double free if AddResource fails
ms_dri2_frame_event_client_gone or ms_dri2_frame_event_drawable_gone already free the resource. Signed-off-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--hw/xfree86/drivers/modesetting/dri2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index 0fe420cbc..83cb3e0e7 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -97,10 +97,8 @@ ms_get_resource(XID id, RESTYPE type)
if (resource == NULL)
return NULL;
- if (!AddResource(id, type, resource)) {
- free(resource);
+ if (!AddResource(id, type, resource))
return NULL;
- }
resource->id = id;
resource->type = type;