database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Make pqexpbuffer a little more robust, per bug report from Heinz Ekker.

Browse Source
This commit is contained in:
Tom Lane
2001-01-19 19:39:23 +00:00
parent e8990eba31
commit 6bb6209bee
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/interfaces/libpq/pqexpbuffer.c
View File

@ -17,7 +17,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/interfaces/libpq/pqexpbuffer.c,v 1.6 2000/04/12 17:17:15 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/pqexpbuffer.c,v 1.7 2001/01/19 19:39:23 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -99,6 +99,9 @@ termPQExpBuffer(PQExpBuffer str)
free(str->data); free(str->data);
str->data = NULL; str->data = NULL;
} }
/* just for luck, make the buffer validly empty. */
str->maxlen = 0;
str->len = 0;
} }
/*------------------------ /*------------------------
@ -139,7 +142,7 @@ enlargePQExpBuffer(PQExpBuffer str, size_t needed)
* overflows. Actually, we might need to more than double it if * overflows. Actually, we might need to more than double it if
* 'needed' is big... * 'needed' is big...
*/ */
newlen = str->maxlen ? (2 * str->maxlen) : 64; newlen = (str->maxlen > 0) ? (2 * str->maxlen) : 64;
while (needed > newlen) while (needed > newlen)
newlen = 2 * newlen; newlen = 2 * newlen;
@ -177,9 +180,9 @@ printfPQExpBuffer(PQExpBuffer str, const char *fmt,...)
* just fall through to enlarge the buffer first. * just fall through to enlarge the buffer first.
*---------- *----------
*/ */
avail = str->maxlen - str->len - 1; if (str->maxlen > str->len + 16)
if (avail > 16)
{ {
avail = str->maxlen - str->len - 1;
va_start(args, fmt); va_start(args, fmt);
nprinted = vsnprintf(str->data + str->len, avail, nprinted = vsnprintf(str->data + str->len, avail,
fmt, args); fmt, args);
@ -226,9 +229,9 @@ appendPQExpBuffer(PQExpBuffer str, const char *fmt,...)
* just fall through to enlarge the buffer first. * just fall through to enlarge the buffer first.
*---------- *----------
*/ */
avail = str->maxlen - str->len - 1; if (str->maxlen > str->len + 16)
if (avail > 16)
{ {
avail = str->maxlen - str->len - 1;
va_start(args, fmt); va_start(args, fmt);
nprinted = vsnprintf(str->data + str->len, avail, nprinted = vsnprintf(str->data + str->len, avail,
fmt, args); fmt, args);