Fix bug in psql.

tatsuo-ishii · tatsuo-ishii · commit cd61650f89a4 · 2002-05-14T04:20:15.000Z
per report from sugita@sra.co.jp on Thu, 09 May 2002 11:57:51 +0900
(JST) at pgsql-patches list.

Illegal long options to pg_dump makes core on some systems, since it
lacks the last null sentinel of struct option array.

Attached is a patch made by Mr. Ishida Akio &lt;iakio@pjam.jpweb.net&gt;.
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.56 2002/04/10 22:47:04 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.57 2002/05/14 04:20:15 ishii Exp $
  */
 #include "postgres_fe.h"
 
@@ -361,6 +361,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 		{"expanded", no_argument, NULL, 'x'},
 		{"no-psqlrc", no_argument, NULL, 'X'},
 		{"help", no_argument, NULL, '?'},
+		{NULL, 0, NULL, 0}
 	};
 
 	int			optindex;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.56 2002/04/10 22:47:04 petere Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.57 2002/05/14 04:20:15 ishii Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -361,6 +361,7 @@ parse_psql_options(int argc, char argv[], struct adhoc_opts options)`
`361`	`361`	`{"expanded", no_argument, NULL, 'x'},`
`362`	`362`	`{"no-psqlrc", no_argument, NULL, 'X'},`
`363`	`363`	`{"help", no_argument, NULL, '?'},`
	`364`	`+ {NULL, 0, NULL, 0}`
`364`	`365`	`};`
`365`	`366`
`366`	`367`	`int optindex;`