Mesa (master): i915/sync: Don't crash when deleting sync object
Chad Versace
chadversary at kemper.freedesktop.org
Thu May 7 15:13:12 UTC 2015
Module: Mesa
Branch: master
Commit: 9cf9a2dec5b3fe3aad878b8ab99d50fbd51e1b9c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9cf9a2dec5b3fe3aad878b8ab99d50fbd51e1b9c
Author: Chad Versace <chad.versace at intel.com>
Date: Tue May 5 19:05:29 2015 -0700
i915/sync: Don't crash when deleting sync object
Don't pass NULL to drm_intel_bo_unreference(). It doesn't like that.
Bug found by code inspection.
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i915/intel_syncobj.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i915/intel_syncobj.c b/src/mesa/drivers/dri/i915/intel_syncobj.c
index d918cd7..92a246d 100644
--- a/src/mesa/drivers/dri/i915/intel_syncobj.c
+++ b/src/mesa/drivers/dri/i915/intel_syncobj.c
@@ -60,7 +60,9 @@ intel_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *s)
{
struct intel_sync_object *sync = (struct intel_sync_object *)s;
- drm_intel_bo_unreference(sync->bo);
+ if (sync->bo)
+ drm_intel_bo_unreference(sync->bo);
+
free(sync);
}
More information about the mesa-commit
mailing list