freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 79d52b9: [truetype] Avoid segfault for invalid variat


From: Werner LEMBERG
Subject: [freetype2] master 79d52b9: [truetype] Avoid segfault for invalid variation data.
Date: Mon, 23 Jan 2017 06:44:13 +0000 (UTC)

branch: master
commit 79d52b9a8d1422587ea4d74ce761fb211b55cd3f
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [truetype] Avoid segfault for invalid variation data.
    
    * src/truetype/ttgxvar.c (ft_var_load_item_variation_store): Assure
    `itemCount' is not zero.
    
    Reported as
    
      https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=441
---
 ChangeLog              |   11 +++++++++++
 src/truetype/ttgxvar.c |   11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 862e31e..7409fb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-01-23  Werner Lemberg  <address@hidden>
+
+       [truetype] Avoid segfault for invalid variation data.
+
+       * src/truetype/ttgxvar.c (ft_var_load_item_variation_store): Assure
+       `itemCount' is not zero.
+
+       Reported as
+
+         https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=441
+
 2017-01-20  Werner Lemberg  <address@hidden>
 
        * src/truetype/ttinterp.c (TT_RunIns): Adjust loop detector limits.
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 386c70f..8004206 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -431,7 +431,8 @@
 
     if ( format != 1 )
     {
-      FT_TRACE2(( "bad store format %d\n", format ));
+      FT_TRACE2(( "ft_var_load_item_variation_store: bad store format %d\n",
+                  format ));
       error = FT_THROW( Invalid_Table );
       goto Exit;
     }
@@ -441,6 +442,14 @@
          FT_READ_USHORT( itemStore->dataCount ) )
       goto Exit;
 
+    /* we need at least one entry in `itemStore->varData' */
+    if ( !itemStore->dataCount )
+    {
+      FT_TRACE2(( "ft_var_load_item_variation_store: missing varData\n" ));
+      error = FT_THROW( Invalid_Table );
+      goto Exit;
+    }
+
     /* make temporary copy of item variation data offsets; */
     /* we will parse region list first, then come back     */
     if ( FT_NEW_ARRAY( dataOffsetArray, itemStore->dataCount ) )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]