NEWS, ChaneLog and backport? Daniel Juyung Seo (SeoZ)
On Sat, Jan 12, 2013 at 2:20 AM, Enlightenment SVN < [email protected]> wrote: > Log: > fix segv in emotion_webcam_init and leak in emotion_webcam_config_load > > Author: jeyzu > Date: 2013-01-11 09:20:22 -0800 (Fri, 11 Jan 2013) > New Revision: 82650 > Trac: http://trac.enlightenment.org/e/changeset/82650 > > Modified: > trunk/efl/src/lib/emotion/emotion_webcam.c > > Modified: trunk/efl/src/lib/emotion/emotion_webcam.c > =================================================================== > --- trunk/efl/src/lib/emotion/emotion_webcam.c 2013-01-11 17:07:04 UTC > (rev 82649) > +++ trunk/efl/src/lib/emotion/emotion_webcam.c 2013-01-11 17:20:22 UTC > (rev 82650) > @@ -215,6 +215,12 @@ > 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 @@ > 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"); > > > > ------------------------------------------------------------------------------ > Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and > much more. Get web development skills now with LearnDevNow - > 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. > SALE $99.99 this month only -- learn more at: > http://p.sf.net/sfu/learnmore_122812 > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_123012 _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
