[freetype2-demos] master c897e7c: * src/ftlint.c (main): Fortify custom indexing.

[Werner Lemberg]

branch: master
commit c897e7cc273e32efdde9a90ca0191fa1fd3003a2
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/ftlint.c (main): Fortify custom indexing.
---
 ChangeLog    |  4 ++++
 src/ftlint.c | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index caea42b..dd5b2c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2021-06-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       * src/ftlint.c (main): Fortify custom indexing.
+
+2021-06-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        * src/ftlint.c (main, Analyze): Fix signed/unsigned mismatch.
 
 2021-06-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
diff --git a/src/ftlint.c b/src/ftlint.c
index 148843b..40430e7 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -141,7 +141,6 @@
         char**  argv )
   {
     int           file_index, face_index;
-    unsigned int  id;
     char*         execname;
     char*         fname;
     int           opt;
@@ -219,6 +218,9 @@
     /* Now check all files */
     for ( face_index = 0, file_index = 1; file_index < argc; file_index++ )
     {
+      unsigned int  id, fi, li;
+
+
       fname = argv[file_index];
 
       printf( "%s:\n", fname );
@@ -243,13 +245,12 @@
       if ( error )
         Panic( "Could not set character size" );
 
-      if ( first_index > (unsigned int)face->num_glyphs )
-        first_index = 0;
-      if ( last_index > (unsigned int)face->num_glyphs )
-        last_index = (unsigned int)face->num_glyphs - 1;
+      fi = first_index > 0 ? first_index : 0;
+      li = last_index < (unsigned int)face->num_glyphs ?
+                        last_index : (unsigned int)face->num_glyphs - 1;
 
       Fail = 0;
-      for ( id = first_index; id <= last_index; id++ )
+      for ( id = fi; id <= li; id++ )
       {
         FT_Bitmap  bitmap;