enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix segv in emotion_webcam_init and leak in emotion_webcam_config_load 

SVN revision: 82650
This commit is contained in:
Jérémy Zurcher 2013-01-11 17:20:22 +00:00
parent 7d5e6fffb9
commit 5b885ea931
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,12 @@ Eina_Bool emotion_webcam_init(void)
eet_init();
_emotion_webcams_edds_new();
if (!_emotion_webcams)
{
_emotion_webcams = calloc(1, sizeof (Emotion_Webcams));
EINA_SAFETY_ON_NULL_RETURN_VAL(_emotion_webcams, EINA_FALSE);
}
#ifdef HAVE_EEZE
eeze_init();
@ -256,12 +262,26 @@ emotion_webcam_shutdown(void)
Eina_Bool
emotion_webcam_config_load(Eet_File *ef)
{
Emotion_Webcams *emotion_webcams = NULL;
if (ef)
{
_emotion_webcams = eet_data_read(ef, _webcams_edd, "config");
emotion_webcams = eet_data_read(ef, _webcams_edd, "config");
INF("Loaded config %p from eet %s", _emotion_webcams, eet_file_get(ef));
}
if (emotion_webcams)
{
if (_emotion_webcams)
{
emotion_webcam_shutdown();
_emotion_webcams = emotion_webcams;
emotion_webcam_init();
}
else
_emotion_webcams = emotion_webcams;
}
if (!_emotion_webcams)
{
DBG("No config, create empty");