[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 7732123 2/2: [ftgrid] Fix crash.
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 7732123 2/2: [ftgrid] Fix crash. |
Date: |
Tue, 3 Oct 2017 10:22:33 -0400 (EDT) |
branch: master
commit 7732123fdefb7cd9366d4d9e584cfd59c6b11e79
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[ftgrid] Fix crash.
* src/ftgrid.c (grid_status_draw_outline): Avoid a crash if a font
can no longer be opened.
---
ChangeLog | 7 +++++++
src/ftgrid.c | 5 ++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 46a9926..bf209f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2017-10-03 Werner Lemberg <address@hidden>
+ [ftgrid] Fix crash.
+
+ * src/ftgrid.c (grid_status_draw_outline): Avoid a crash if a font
+ can no longer be opened.
+
+2017-10-03 Werner Lemberg <address@hidden>
+
Correctly handle Type1 font names without extension.
* src/ftcommon.c (my_face_requester): Unset the suffix if the font
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 07c0509..74b2d8d 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -677,6 +677,7 @@
FTDemo_Handle* handle,
FTDemo_Display* display )
{
+ FT_Error err;
FT_Size size;
FT_GlyphSlot slot;
FT_UInt glyph_idx;
@@ -685,7 +686,9 @@
int oy = st->y_origin;
- FTDemo_Get_Size( handle, &size );
+ err = FTDemo_Get_Size( handle, &size );
+ if ( err )
+ return;
#ifdef FT_DEBUG_AUTOFIT
/* Draw segment before drawing glyph. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 7732123 2/2: [ftgrid] Fix crash.,
Werner LEMBERG <=