* src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit.

6 years ago · 7665914ccd
parent a5818ed1e1
commit 7665914ccd
2 changed files with 12 additions and 1 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2018-09-13  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Fix last commit.
+
 2018-09-13  Werner Lemberg  <wl@gnu.org>

 	* src/sfnt/sfdriver.c (sfnt_get_var_ps_name): Check `result'.
--- 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 */