From 876e80c1f83a01b7286366989b3a052f486a1116 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 30 May 2011 13:59:18 +0000 Subject: [PATCH] Evas font-engine: font_run_end_get. Fix possible segfault. Patch by Cedric. SVN revision: 59817 --- legacy/evas/src/lib/engines/common/evas_font_query.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c index d6760a7..d604e8a 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_query.c +++ b/legacy/evas/src/lib/engines/common/evas_font_query.c @@ -102,8 +102,11 @@ evas_common_font_query_run_font_end_get(RGBA_Font *fn, RGBA_Font_Int **script_fi for ( ; itr < run_end ; itr++) { if (evas_common_get_char_index(fi, *itr) || - evas_common_font_glyph_search(fn, &fi, *itr)) - break; + evas_common_font_glyph_search(fn, &tmp_fi, *itr)) + { + fi = tmp_fi; + break; + } } /* If we found a renderable character and the found font -- 2.7.4