kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_imf: Add NULL check before accessing evas device API

This commit is contained in:
Jihoon Kim 2015-03-24 20:33:45 +09:00
parent b8b6c1e1a8
commit 56dc26f0b9
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/ecore_imf_evas/ecore_imf_evas.c
View File

@ -184,9 +184,20 @@ ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event,
imf_event->string = evas_event->string ? evas_event->string : _ecore_imf_evas_event_empty;
imf_event->compose = evas_event->compose ? evas_event->compose : _ecore_imf_evas_event_empty;
imf_event->timestamp = evas_event->timestamp;
imf_event->dev_name = evas_device_name_get(evas_event->dev) ? evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
imf_event->dev_class = evas_device_class_get(evas_event->dev);
imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
if (evas_event->dev)
{
imf_event->dev_name = evas_device_name_get(evas_event->dev) ? evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
imf_event->dev_class = evas_device_class_get(evas_event->dev);
imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
}
else
{
imf_event->dev_name = _ecore_imf_evas_event_empty;
imf_event->dev_class = ECORE_IMF_DEVICE_CLASS_NONE;
imf_event->dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
}
_ecore_imf_evas_event_modifiers_wrap(evas_event->modifiers, &imf_event->modifiers);
_ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks);
}
@ -212,9 +223,20 @@ ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event,
imf_event->string = evas_event->string ? evas_event->string : _ecore_imf_evas_event_empty;
imf_event->compose = evas_event->compose ? evas_event->compose : _ecore_imf_evas_event_empty;
imf_event->timestamp = evas_event->timestamp;
imf_event->dev_name = evas_device_name_get(evas_event->dev) ? evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
imf_event->dev_class = evas_device_class_get(evas_event->dev);
imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
if (evas_event->dev)
{
imf_event->dev_name = evas_device_name_get(evas_event->dev) ? evas_device_name_get(evas_event->dev) : _ecore_imf_evas_event_empty;
imf_event->dev_class = evas_device_class_get(evas_event->dev);
imf_event->dev_subclass = evas_device_subclass_get(evas_event->dev);
}
else
{
imf_event->dev_name = _ecore_imf_evas_event_empty;
imf_event->dev_class = ECORE_IMF_DEVICE_CLASS_NONE;
imf_event->dev_subclass = ECORE_IMF_DEVICE_SUBCLASS_NONE;
}
_ecore_imf_evas_event_modifiers_wrap(evas_event->modifiers, &imf_event->modifiers);
_ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks);
}