jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text-freetype2: Fix null poitner dereference

master
jp9000 2014-08-26 10:20:13 -07:00
parent 6e7f2e1c98
commit ab4efe4dd1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/text-freetype2/text-freetype2.c
View File

@ -356,7 +356,8 @@ static void ft2_source_update(void *data, obs_data_t settings)
}
srcdata->texbuf = bzalloc(texbuf_w * texbuf_h * 4);
cache_standard_glyphs(srcdata);
if (srcdata->font_face)
cache_standard_glyphs(srcdata);
skip_font_load:;
if (from_file) {
const char *tmp = obs_data_get_string(settings, "text_file");
@ -392,9 +393,10 @@ skip_font_load:;
os_utf8_to_wcs_ptr(tmp, strlen(tmp), &srcdata->text);
}
cache_glyphs(srcdata, srcdata->text);
set_up_vertex_buffer(srcdata);
if (srcdata->font_face) {
cache_glyphs(srcdata, srcdata->text);
set_up_vertex_buffer(srcdata);
}
error:
obs_data_release(font_obj);

7
plugins/text-freetype2/text-functionality.c
View File

@ -216,9 +216,14 @@ void cache_standard_glyphs(struct ft2_source *srcdata)
void cache_glyphs(struct ft2_source *srcdata, wchar_t *cache_glyphs)
{
FT_GlyphSlot slot = srcdata->font_face->glyph;
FT_GlyphSlot slot;
FT_UInt glyph_index = 0;
if (!srcdata->font_face)
return;
slot = srcdata->font_face->glyph;
uint32_t dx = srcdata->texbuf_x, dy = srcdata->texbuf_y;
uint8_t alpha;