gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed segfault in fl_set_fonts_xft.cxx when loading fonts not named

Browse Source 
as expected (STR #2976).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10041 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2014-01-03 16:17:05 +00:00
parent 1af599b4af
commit 642c475493
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.3 RELEASED: MMM DD YYYY
- Fixed segfault in fl_set_fonts_xft.cxx when loading fonts not named
as expected (STR #2976).
- Removed autoconf/configure and CMake tests and defines for
unused function strtoll().
- Fixed access of protected member (STR #2903)

4
src/fl_set_fonts_xft.cxx
View File

@ -82,7 +82,6 @@ static void make_raw_name(char *raw, char *pretty)
// italic, bold, bold italic or normal - this seems to be the fltk way...
char *style = strchr(pretty, ':');
char *last = style + strlen(style) - 2;
if (style)
{
@ -120,7 +119,10 @@ static void make_raw_name(char *raw, char *pretty)
#define BOLD 1
#define ITALIC 2
#define BITALIC (BOLD | ITALIC)
int mods = PLAIN;
char *last = style + strlen(style) - 2;
// Now try and parse the style string - look for the "=" sign
style = strchr(style, '=');
while ((style) && (style < last))