LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

oc-rtf: Don't crash when we don't know the specified font

pull/69/head
Jesús García Sáez 2014-07-31 20:44:14 +02:00 committed by Julio García
parent 68c38e2b5c
commit 4e3a242f2f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenChange/RTFHandler.m
View File

@ -814,20 +814,28 @@ const unsigned short ansicpg874[256] = {
if (!formattingOptions)
continue;
if (formattingOptions->font_index >= 0 &&
font_index != formattingOptions->font_index)
{
[_html appendBytes: "</font>" length: 7];
}
formattingOptions->font_index = font_index;
fontInfo = [fontTable fontInfoAtIndex: font_index];
char *v = malloc(128*sizeof(char));
memset(v, 0, 128);
sprintf(v, "<font face=\"%s\">", [fontInfo->name UTF8String]);
char *v = calloc(128, sizeof(char));
if (fontInfo)
{
sprintf(v, "<font face=\"%s\">", [fontInfo->name UTF8String]);
}
else
{
// RTF badformed? We don't know about that font (font_index).
// Anyhow, we still open the html tag because in the future
// we will close it (e.g. when new font is used).
sprintf(v, "<font>");
}
[_html appendBytes: v length: strlen(v)];
free(v);
}