do not dereference argv[1] if it is nonexistent (from Akira)

git-svn-id: svn://tug.org/texlive/trunk@16205 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 16 insertions, 4 deletions

diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index c62978b3ca8..64e25daed90 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-27  Karl Berry  <karl@tug.org>
+
+	* ttf2pk.c (USAGE): mention email address, update copyrights.
+
+2009-11-27  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* ttf2pk.c (main): do not dereference argv[1] if it's nonexistent.
+
 2009-11-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac, filesrch.c: Require recent kpathsea version.
@@ -46,4 +54,3 @@
 	* Makefile.in: Add @configure_input@ line.
 	* aclocal.m4 (new): Generated (aclocal -I ../m4).
 	* configure: Regenerated (autoconf).
-
diff --git a/Build/source/texk/ttf2pk/ttf2pk.c b/Build/source/texk/ttf2pk/ttf2pk.c
index c30586f9b81..1cb0bc9f514 100644
--- a/Build/source/texk/ttf2pk/ttf2pk.c
+++ b/Build/source/texk/ttf2pk/ttf2pk.c
@@ -1,11 +1,13 @@
 /*
  *   ttf2pk.c
  *
- *   This file is part of the ttf2pk package.
+ *   This file is part of the ttf2pk package, released under the
+ *   GNU GPL version 2 or any later version.
  *
  *   Copyright 1997-1999, 2000, 2002 by
  *     Frederic Loyer <loyer@ensta.fr>
  *     Werner Lemberg <wl@gnu.org>
+ *   Copyright 2009 Peter Breitenlohner
  */
 
 #include <stdio.h>
@@ -67,6 +69,8 @@ strip_equal(char *s, char *os, char *p)
 -t                  test for <font> (returns 0 on success)\n\
 --help              print this message and exit\n\
 --version           print version number and exit\n\
+
+Report bugs to tex-k@tug.org.
 "
 
 static void
@@ -80,7 +84,7 @@ usage(void)
 
 
 #define VERSION "\
-Copyright (C) 1997-1999, 2000, 2002 Frederic Loyer and Werner Lemberg.\n\
+Copyright (C) 1997-1999, 2000, 2002, 2009 Frederic Loyer and Werner Lemberg.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License\n\
 and the gsftopk copyright.\n\
@@ -93,6 +97,7 @@ Primary authors of ttf2pk: F. Loyer and W. Lemberg.\n\
 ttf2pk is partially based on gsftopk from P. Vojta\n\
 and the FreeType project from\n\
 David Turner, Robert Wilhelm, and Werner Lemberg\n\
+
 "
 
 static void
@@ -323,7 +328,7 @@ main(int argc, char** argv)
       version();
   }
 
-  while (argv[1][0] == '-')
+  while (argv[1] && argv[1][0] == '-')
   {
     if (argv[1][1] == 'q')
       quiet = True;