kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

FS-7613: fix use after free error in switch_img_txt_handle_render

Browse Source
This commit is contained in:
Michael Jerris 2015-06-05 17:57:06 -05:00 committed by Brian West
parent 9a6344c30f
commit 90bae91af7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/switch_core_video.c
View File

@ -822,6 +822,7 @@ SWITCH_DECLARE(uint32_t) switch_img_txt_handle_render(switch_img_txt_handle_t *h
FT_Face face; FT_Face face;
uint32_t width = 0; uint32_t width = 0;
int this_x = 0, last_x = 0, space = 0; int this_x = 0, last_x = 0, space = 0;
uint32_t ret;
if (zstr(text)) return 0; if (zstr(text)) return 0;
@ -920,9 +921,11 @@ SWITCH_DECLARE(uint32_t) switch_img_txt_handle_render(switch_img_txt_handle_t *h
pen.y += slot->advance.y >> 6; pen.y += slot->advance.y >> 6;
} }
ret = width + slot->bitmap.width * 3;
FT_Done_Face(face); FT_Done_Face(face);
return width + slot->bitmap.width * 3; return ret;
#else #else
return 0; return 0;
#endif #endif