From f91a2037a58c410e2326be431f6e704f91329485 Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Wed, 4 Jan 2012 20:48:15 -0500 Subject: [PATCH] intel accelerant: NULL dereferences (overlays) Rather than checking if "window" AND "view" are NULL, check if "window" OR "view" are NULL, since neither could be null and deferenced later on. From the Matrox accelerant, it seems that such event occurs when a "Workspace switch, screen prefs change, or overlay app shutdown occurs" Might be interesting to revisit tickets related to intel accelerant. CID 205. --- src/add-ons/accelerants/intel_extreme/overlay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/add-ons/accelerants/intel_extreme/overlay.cpp b/src/add-ons/accelerants/intel_extreme/overlay.cpp index a36f46dd3e..58430e64f6 100644 --- a/src/add-ons/accelerants/intel_extreme/overlay.cpp +++ b/src/add-ons/accelerants/intel_extreme/overlay.cpp @@ -543,7 +543,7 @@ intel_configure_overlay(overlay_token overlayToken, if (overlayToken != (overlay_token)gInfo->shared_info->overlay_token) return B_BAD_VALUE; - if (window == NULL && view == NULL) { + if (window == NULL || view == NULL) { hide_overlay(); return B_OK; }