summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2af6608eb2..95ee2abefd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-11-26 ChunEon Park (Hermet)
2
3 * Evas: Fix the memory corruption introduced by evas fonts_zero.
4
12013-11-26 Daniel Juyung Seo (SeoZ) 52013-11-26 Daniel Juyung Seo (SeoZ)
2 6
3 * ecore anim: Fixed animator not working problem when source_set is 7 * ecore anim: Fixed animator not working problem when source_set is
diff --git a/NEWS b/NEWS
index 56b44c3069..e5a8bbe65a 100644
--- a/NEWS
+++ b/NEWS
@@ -365,6 +365,7 @@ Fixes:
365 - Evas textblock: Fixed order of tags inserted with markup_app/prepend. 365 - Evas textblock: Fixed order of tags inserted with markup_app/prepend.
366 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively. 366 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively.
367 - Evas textblock: Fixed wrapping of lines ending with whites. 367 - Evas textblock: Fixed wrapping of lines ending with whites.
368 - Evas: Fix the memory corruption introduced by evas fonts_zero.
368 369
369 * Ecore: 370 * Ecore:
370 - Don't leak fd on exec. 371 - Don't leak fd on exec.
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 383082ea58..cbe9605ab5 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -491,7 +491,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
491#endif 491#endif
492 492
493 Evas_Font_Set *font = NULL; 493 Evas_Font_Set *font = NULL;
494 Eina_List *fonts, *l; 494 Eina_List *fonts, *l, *l_next;
495 Fndat *fd; 495 Fndat *fd;
496#ifdef HAVE_FONTCONFIG 496#ifdef HAVE_FONTCONFIG
497 Fndat *found_fd = NULL; 497 Fndat *found_fd = NULL;
@@ -541,7 +541,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
541 } 541 }
542#endif 542#endif
543 543
544 EINA_LIST_FOREACH(fonts_zero, l, fd) 544 EINA_LIST_FOREACH_SAFE(fonts_zero, l, l_next, fd)
545 { 545 {
546 if (!evas_font_desc_cmp(fdesc, fd->fdesc)) 546 if (!evas_font_desc_cmp(fdesc, fd->fdesc))
547 { 547 {