* src/pcf/pcfread.c (pcf_read_TOC): Improve fix from 2014-12-08.

10 years ago · 06842c7b49
parent bef8df0a3a
commit 06842c7b49
2 changed files with 8 additions and 3 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+2014-12-13  Werner Lemberg  <wl@gnu.org>
+
+	* src/pcf/pcfread.c (pcf_read_TOC): Improve fix from 2014-12-08.
+
 2014-12-11  Werner Lemberg  <wl@gnu.org>

 	* builds/toplevel.mk (dist): Use older POSIX standard for `tar'.
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@ -192,14 +192,15 @@ THE SOFTWARE.
      tables++;
    }

-    /* no check of `tables->size' for last table element ... */
+    /* only check `tables->offset' for last table element ... */
    if ( ( tables->offset > size ) )
    {
      error = FT_THROW( Invalid_Table );
      goto Exit;
    }
-    /* ... instead, we adjust `tables->size' to the real value */
-    tables->size = size - tables->offset;
+    /* ... and adjust `tables->size' to the real value if necessary */
+    if ( tables->size > size - tables->offset )
+      tables->size = size - tables->offset;

 #ifdef FT_DEBUG_LEVEL_TRACE