diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-04-24 22:41:43 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-04-24 22:41:43 +0000 |
| commit | 297e7f3ef4276f4f32f3048353fe8f38f7eabc70 (patch) | |
| tree | 3a5a5b39bbaf5c2cdc7aaa37c88a13dbd8c8ee49 | |
| parent | 11ae8ba7ea3329fbb6bc971347302fb535d9a5f3 (diff) | |
| download | postgresql-297e7f3ef4276f4f32f3048353fe8f38f7eabc70.tar.gz postgresql-297e7f3ef4276f4f32f3048353fe8f38f7eabc70.zip | |
Fix \h to not go past array bounds
| -rw-r--r-- | src/bin/psql/help.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 8c960723fc0..35005727f7d 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.25 2000/04/12 17:16:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.26 2000/04/24 22:41:43 momjian Exp $ */ #include "postgres.h" #include "help.h" @@ -265,13 +265,14 @@ helpSQL(const char *topic) for (i = 0; i < items_per_column; i++) { - printf(" %-25s%-25s%-25s\n", - VALUE_OR_NULL(QL_HELP[i].cmd), - VALUE_OR_NULL(QL_HELP[i + items_per_column].cmd), - VALUE_OR_NULL(QL_HELP[i + 2 * items_per_column].cmd) - ); + printf(" %-25s%-25s", + VALUE_OR_NULL(QL_HELP[i].cmd), + VALUE_OR_NULL(QL_HELP[i + items_per_column].cmd)); + if (i + 2 * items_per_column < QL_HELP_COUNT) + printf("%-25s", + VALUE_OR_NULL(QL_HELP[i + 2 * items_per_column].cmd)); + fputc('\n', stdout); } - putc('\n', stdout); } else |