From 9df58ae530b08cc59bf9cfc13fee909a75db2f4f Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 8 Jul 2010 03:21:33 +0000 Subject: [PATCH] Remove NULL pointer dereference Bug found by the "andand" semantic patch: // The right argument of || or && is dereferencing something known to be NULL // // Confidence: High // Copyright: (C) Gilles Muller, Julia Lawall, EMN, INRIA, DIKU. GPLv2. // URL: http://coccinelle.lip6.fr/rules/andand.html // Options: @ expression@ expression E; identifier fld; @@ - !E && + !E || <+...E->fld...+> @ expression@ expression E; identifier fld; @@ - E || + E && <+...E->fld...+> SVN revision: 50118 --- legacy/evas/src/modules/engines/quartz/evas_engine.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/modules/engines/quartz/evas_engine.c b/legacy/evas/src/modules/engines/quartz/evas_engine.c index 160f043037..c19a6bb92a 100644 --- a/legacy/evas/src/modules/engines/quartz/evas_engine.c +++ b/legacy/evas/src/modules/engines/quartz/evas_engine.c @@ -807,7 +807,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t { Evas_Quartz_Image *im = (Evas_Quartz_Image *)image; - if (!im && !im->im) return ; + if (!im || !im->im) return ; evas_cache_image_preload_data(&im->im->cache_entry, target); } @@ -816,7 +816,7 @@ eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *ta { Evas_Quartz_Image *im = (Evas_Quartz_Image *)image; - if (!im && !im->im) return ; + if (!im || !im->im) return ; evas_cache_image_preload_cancel(&im->im->cache_entry, target); }