From 317f074fc1a497b9906bcd1f11535c727f42372f Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 8 Jul 2012 10:31:34 +0000 Subject: [PATCH] Elm smart/pan: Check obj != NULL before fetching smart data. Patch by Daniel Zaoui. SVN revision: 73464 --- legacy/elementary/src/lib/els_pan.c | 2 +- legacy/elementary/src/lib/els_scroller.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/els_pan.c b/legacy/elementary/src/lib/els_pan.c index 4e02b3d38d..4ec565fb36 100644 --- a/legacy/elementary/src/lib/els_pan.c +++ b/legacy/elementary/src/lib/els_pan.c @@ -2,7 +2,7 @@ #include "elm_priv.h" #define SMART_NAME "elm_pan" -#define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME))) +#define API_ENTRY Smart_Data *sd = NULL; if ((!obj) || (!(sd = evas_object_smart_data_get(obj))) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME))) #define INTERNAL_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return; typedef struct _Smart_Data Smart_Data; diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 520cf327a7..1723dc1516 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -4,7 +4,7 @@ #include "els_pan.h" #define SMART_NAME "els_scroller" -#define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME))) +#define API_ENTRY Smart_Data *sd = NULL; if ((!obj) || (!(sd = evas_object_smart_data_get(obj))) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME))) #define INTERNAL_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return; typedef struct _Smart_Data Smart_Data;