[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 7665914: * src/sfnt/sfdriver.c (sfnt_get_var_ps_name)
From: |
Werner LEMBERG |
Subject: |
[freetype2] master 7665914: * src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit. |
Date: |
Thu, 13 Sep 2018 02:59:01 -0400 (EDT) |
branch: master
commit 7665914ccd2edf011cfe2834f8a058e4e68d3361
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
* src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit.
---
ChangeLog | 4 ++++
src/sfnt/sfdriver.c | 9 ++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8436079..004fc4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2018-09-13 Werner Lemberg <address@hidden>
+ * src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit.
+
+2018-09-13 Werner Lemberg <address@hidden>
+
* src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Check `result'.
Reported as
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index b7e4358..23f4a18 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -841,7 +841,14 @@
sfnt_is_alphanumeric,
0 );
- len = result ? ft_strlen( result ) : 0;
+ if ( !result )
+ {
+ FT_TRACE0(( "sfnt_get_var_ps_name:"
+ " No valid PS name prefix for font instances found\n" ));
+ return NULL;
+ }
+
+ len = ft_strlen( result );
/* sanitize if necessary; we reserve space for 36 bytes (a 128bit */
/* checksum as a hex number, preceded by `-' and followed by three */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 7665914: * src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit.,
Werner LEMBERG <=