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

emotion - webcam - don't access after free and ensure it is not in list 

this should fix CID 1137853 and CID 1137854
This commit is contained in:
Carsten Haitzler 2013-12-15 11:29:07 +09:00
parent 5dfe3789f2
commit 6d5058ee1c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/emotion/emotion_webcam.c
View File

@ -138,6 +138,7 @@ _emotion_check_device(Emotion_Webcam *ew)
on_error:
#endif
INF("'%s' is not a webcam ['%s']", ew->name, strerror(errno));
_emotion_webcams->webcams = eina_list_remove(_emotion_webcams->webcams, ew);
eina_stringshare_del(ew->syspath);
eina_stringshare_del(ew->device);
eina_stringshare_del(ew->name);
@ -211,8 +212,6 @@ _emotion_process_webcam(void *data)
{
if (_emotion_check_device(test))
ecore_event_add(EMOTION_WEBCAM_ADD, test, NULL, NULL);
else
_emotion_webcam_remove_cb(test, NULL);
}
eina_stringshare_del(syspath);
@ -263,8 +262,6 @@ _emotion_eeze_events(const char *syspath,
{
if (_emotion_check_device(test))
ecore_event_add(EMOTION_WEBCAM_ADD, test, NULL, NULL);
else
_emotion_webcam_remove_cb(test, NULL);
}
}
ecore_event_add(EMOTION_WEBCAM_UPDATE, NULL, NULL, NULL);