summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-09 17:53:10 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-01-09 18:57:22 +0000
commitafb779bda5d2cea7afd1df553913ecbe2b94541f (patch)
tree30eca577377464ccd0020e48e034b048153c7a4c
parent96ce456e19c02ac87893a86954ca4982130a9ff2 (diff)
edje - stop trying to access ready deleted exrt/group swallow objects
_edje_real_part_swallow_clear() would try and manipulate already deleted group/external objects (not manually swallowed ones) thus causing safety noise. @fix.
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_load.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 3f4c871c59..e40e1b473a 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -2017,12 +2017,11 @@ _edje_file_del(Edje *ed)
2017 // fallthrough intentional 2017 // fallthrough intentional
2018 case EDJE_PART_TYPE_GROUP: 2018 case EDJE_PART_TYPE_GROUP:
2019 evas_object_del(rp->typedata.swallow->swallowed_object); 2019 evas_object_del(rp->typedata.swallow->swallowed_object);
2020 2020 rp->typedata.swallow->swallowed_object = NULL;
2021 default: 2021 default:
2022 break; 2022 break;
2023 } 2023 }
2024 _edje_real_part_swallow_clear(ed, rp); 2024 _edje_real_part_swallow_clear(ed, rp);
2025 rp->typedata.swallow->swallowed_object = NULL;
2026 } 2025 }
2027 free(rp->typedata.swallow); 2026 free(rp->typedata.swallow);
2028 rp->typedata.swallow = NULL; 2027 rp->typedata.swallow = NULL;