From: Jean-Philippe Andre Date: Tue, 4 Jun 2013 10:51:13 +0000 (+0900) Subject: evas/cserve2: fix SIGFPE in expedite test case. X-Git-Tag: submit/devel/efl/20131022.203902~776 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6531423fd732bc06c9beaef2217ee3ec2db95f6b;p=platform%2Fupstream%2Fefl.git evas/cserve2: fix SIGFPE in expedite test case. Signed-off-by: Cedric Bail --- diff --git a/src/bin/evas/evas_cserve2_fonts.c b/src/bin/evas/evas_cserve2_fonts.c index 211ee47..3a12305 100644 --- a/src/bin/evas/evas_cserve2_fonts.c +++ b/src/bin/evas/evas_cserve2_fonts.c @@ -395,9 +395,12 @@ end: static unsigned int _font_slave_int_shm_prev_calculate(unsigned int size, unsigned int nglyphs) { - unsigned int average = size / nglyphs; + unsigned int average; unsigned int newsize; + if (!nglyphs) return cserve2_shm_size_normalize(1); + average = size / nglyphs; + newsize = MIN_GLYPHS * average; newsize = cserve2_shm_size_normalize(newsize); @@ -530,7 +533,7 @@ _font_slave_glyphs_load(const void *cmddata, void *data EINA_UNUSED) if (!r) // SHM is full { fi->shmsize = _font_slave_int_shm_prev_calculate - (c->usage, total_glyphs); + (c->usage, total_glyphs); c = NULL; continue; }