[freetype2-demos] master a037baa4: * src/ftdump.c (Print_Glyfs): Avoid numeric overflow.

[Werner Lemberg]

branch: master
commit a037baa4ecf42ed0fd8a2ae6a53333f8cb2a993c
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    * src/ftdump.c (Print_Glyfs): Avoid numeric overflow.
    
    Reported by Marc Schönefeld <marc.schoenefeld@gmx.org>.
---
 src/ftdump.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ftdump.c b/src/ftdump.c
index c159d3e0..553ba951 100644
--- a/src/ftdump.c
+++ b/src/ftdump.c
@@ -1332,9 +1332,9 @@
         continue;
       }
 
-      if ( loc + 1 >= end )
+      if ( end == 0 || loc >= end - 1 )
       {
-        printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
+        printf( "\nglyph %hd: invalid offset (%u)\n", i, loc );
         continue;
       }
 
@@ -1347,7 +1347,7 @@
 
         if ( loc + 1 >= end )
         {
-          printf( "\nglyph %hd: invalid offset (%d)\n", i, loc );
+          printf( "\nglyph %hd: invalid offset (%u)\n", i, loc );
           continue;
         }