woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=de943b82aabab0db8056152392502372e5587e6b
commit de943b82aabab0db8056152392502372e5587e6b Author: WooHyun Jung <[email protected]> Date: Mon Apr 13 10:39:34 2020 +0900 edje_calc: add null check after eet_read --- src/lib/edje/edje_calc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 1a88b23d0e..2af4934ce9 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -3239,19 +3239,22 @@ _edje_vector_load_lottie(Edje *ed, Edje_Real_Part *ep, const char *key) if (ep->typedata.vector->current_id != desc->vg.id) { lottie_data = (char *)eet_read(ed->file->ef, key, &lottie_data_len); - lottie_data[lottie_data_len] = '\0'; - file = eina_file_virtualize(NULL, lottie_data, lottie_data_len + 1, EINA_FALSE); - efl_file_simple_mmap_load(ep->object, file, NULL); + if (lottie_data) + { + lottie_data[lottie_data_len] = '\0'; + file = eina_file_virtualize(NULL, lottie_data, lottie_data_len + 1, EINA_FALSE); + efl_file_simple_mmap_load(ep->object, file, NULL); - if (ep->typedata.vector->lottie_virtual_file) - eina_file_close(ep->typedata.vector->lottie_virtual_file); - ep->typedata.vector->lottie_virtual_file = file; + if (ep->typedata.vector->lottie_virtual_file) + eina_file_close(ep->typedata.vector->lottie_virtual_file); + ep->typedata.vector->lottie_virtual_file = file; - if (ep->typedata.vector->lottie_data) - free(ep->typedata.vector->lottie_data); - ep->typedata.vector->lottie_data = lottie_data; + if (ep->typedata.vector->lottie_data) + free(ep->typedata.vector->lottie_data); + ep->typedata.vector->lottie_data = lottie_data; - ep->typedata.vector->current_id = desc->vg.id; + ep->typedata.vector->current_id = desc->vg.id; + } } frame_duration = efl_gfx_frame_controller_frame_duration_get(ep->object, 0, 0); --
