[freetype2-demos] master c0289e8: * src/ftlint.c (main): Fix segfault with bad command line.

[Werner Lemberg]

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

    * src/ftlint.c (main): Fix segfault with bad command line.
---
 src/ftlint.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ftlint.c b/src/ftlint.c
index b314b4d..103117a 100644
--- a/src/ftlint.c
+++ b/src/ftlint.c
@@ -79,7 +79,8 @@
       "  -f L    Use hex number L as load flags (see `FT_LOAD_XXX')\n"
       "  -r N    Set render mode to N\n"
       "  -i I-J  Range of glyph indices to use (default: all)\n"
-      "  -q      Quiet mode without the rendering analysis\n" );
+      "  -q      Quiet mode without the rendering analysis\n"
+      "\n" );
 
     exit( 1 );
   }
@@ -230,9 +231,6 @@
 
     execname = ft_basename( argv[0] );
 
-    if ( argc < 3 )
-      Usage( execname );
-
     while ( ( opt =  getopt( argc, argv, "f:r:i:q") ) != -1)
     {
 
@@ -285,8 +283,7 @@
     argc -= optind;
     argv += optind;
 
-
-    if( sscanf( argv[0], "%d", &ptsize) != 1 )
+    if ( argc < 2 || sscanf( argv[0], "%d", &ptsize) != 1 )
       Usage( execname );
 
     error = FT_Init_FreeType( &library );