diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-03-07 23:46:41 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-03-11 00:51:07 +0200 |
| commit | ebe608915cf9b6689b6dfcb92ddb31c8da765670 (patch) | |
| tree | e149565c664af8c24dc74bb8b2f26d130a310309 | |
| parent | 0e925196340bf9279238f780cc10125fca2a0733 (diff) | |
psql: Fix invalid memory access
Due to an apparent thinko, when printing a table in expanded mode
(\x), space would be allocated for 1 slot plus 1 byte per line,
instead of 1 slot per line plus 1 slot for the NULL terminator. When
the line count is small, reading or writing the terminator would
therefore access memory beyond what was allocated.
| -rw-r--r-- | src/bin/psql/print.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c index 9c38be1fd2f..7334e8dbfe4 100644 --- a/src/bin/psql/print.c +++ b/src/bin/psql/print.c @@ -1177,8 +1177,8 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout) * We now have all the information we need to setup the formatting * structures */ - dlineptr = pg_local_malloc((sizeof(*dlineptr) + 1) * dheight); - hlineptr = pg_local_malloc((sizeof(*hlineptr) + 1) * hheight); + dlineptr = pg_local_malloc((sizeof(*dlineptr)) * (dheight + 1)); + hlineptr = pg_local_malloc((sizeof(*hlineptr)) * (hheight + 1)); dlineptr->ptr = pg_local_malloc(dformatsize); hlineptr->ptr = pg_local_malloc(hformatsize); |