projects / postgresql.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 77c4ba6)
Fix bug in pg_dump and psql (to reproduce the bug, just try pg_dump
authorTatsuo Ishii <ishii@postgresql.org>
Tue, 14 May 2002 02:08:22 +0000 (02:08 +0000)
committerTatsuo Ishii <ishii@postgresql.org>
Tue, 14 May 2002 02:08:22 +0000 (02:08 +0000)
--nonexistingoption).

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 <iakio@pjam.jpweb.net>.

src/bin/pg_dump/pg_dump.c patch | blob | blame | history
src/bin/psql/startup.c patch | blob | blame | history

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 64b4887e29c48e3dbaf06f1c7d7c57d37c6e223d..f6e67719f08525f85bf2be78d2c039262061cb6c 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.241 2002/02/11 00:18:20 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.241.2.1 2002/05/14 02:08:22 ishii Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -701,7 +701,8 @@ main(int argc, char **argv)
         * the following options don't have an equivalent short option
         * letter, but are available as '-X long-name'
         */
-       {"use-set-session-authorization", no_argument, &use_setsessauth, 1}
+       {"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+       {NULL, 0, NULL, 0}
    };
    int         optindex;
 #endif
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 9e4185de3be51fe93c4450d7239ed53333a49db2..00c696135f4f27b7bb2b6c9afba12bf4b021c3d0 100644 (file)
--- 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.54 2001/11/05 17:46:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.54.2.1 2002/05/14 02:08:22 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;
This is the main PostgreSQL git repository.