Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
c897e7cc
by Alexei Podtelezhnikov at 2021-06-18T00:23:24-04:00
2 changed files:
Changes:
| 1 |
+2021-06-17 Alexei Podtelezhnikov <apodtele@gmail.com>
|
|
| 2 |
+ |
|
| 3 |
+ * src/ftlint.c (main): Fortify custom indexing.
|
|
| 4 |
+ |
|
| 1 | 5 |
2021-06-17 Alexei Podtelezhnikov <apodtele@gmail.com>
|
| 2 | 6 |
|
| 3 | 7 |
* src/ftlint.c (main, Analyze): Fix signed/unsigned mismatch.
|
| ... | ... | @@ -141,7 +141,6 @@ |
| 141 | 141 |
char** argv )
|
| 142 | 142 |
{
|
| 143 | 143 |
int file_index, face_index;
|
| 144 |
- unsigned int id;
|
|
| 145 | 144 |
char* execname;
|
| 146 | 145 |
char* fname;
|
| 147 | 146 |
int opt;
|
| ... | ... | @@ -219,6 +218,9 @@ |
| 219 | 218 |
/* Now check all files */
|
| 220 | 219 |
for ( face_index = 0, file_index = 1; file_index < argc; file_index++ )
|
| 221 | 220 |
{
|
| 221 |
+ unsigned int id, fi, li;
|
|
| 222 |
+ |
|
| 223 |
+ |
|
| 222 | 224 |
fname = argv[file_index];
|
| 223 | 225 |
|
| 224 | 226 |
printf( "%s:\n", fname );
|
| ... | ... | @@ -243,13 +245,12 @@ |
| 243 | 245 |
if ( error )
|
| 244 | 246 |
Panic( "Could not set character size" );
|
| 245 | 247 |
|
| 246 |
- if ( first_index > (unsigned int)face->num_glyphs )
|
|
| 247 |
- first_index = 0;
|
|
| 248 |
- if ( last_index > (unsigned int)face->num_glyphs )
|
|
| 249 |
- last_index = (unsigned int)face->num_glyphs - 1;
|
|
| 248 |
+ fi = first_index > 0 ? first_index : 0;
|
|
| 249 |
+ li = last_index < (unsigned int)face->num_glyphs ?
|
|
| 250 |
+ last_index : (unsigned int)face->num_glyphs - 1;
|
|
| 250 | 251 |
|
| 251 | 252 |
Fail = 0;
|
| 252 |
- for ( id = first_index; id <= last_index; id++ )
|
|
| 253 |
+ for ( id = fi; id <= li; id++ )
|
|
| 253 | 254 |
{
|
| 254 | 255 |
FT_Bitmap bitmap;
|
| 255 | 256 |
|