diff options
Diffstat (limited to 'src/interfaces/libpq/fe-exec.c')
| -rw-r--r-- | src/interfaces/libpq/fe-exec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 1f452ffe2d1..b9517cebbf2 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.45 1997/12/23 20:00:06 thomas Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.46 1998/01/26 01:42:35 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -168,7 +168,7 @@ getTuple(PGconn *conn, PGresult *result, int binary) if ((nfields % BYTELEN) > 0) nbytes++; - if (pqGetnchar(bitmap, nbytes, pfin, pfdebug) == 1) + if (nbytes >= MAX_FIELDS || pqGetnchar(bitmap, nbytes, pfin, pfdebug) == 1) { sprintf(conn->errorMessage, "Error reading null-values bitmap from row data stream\n"); @@ -189,10 +189,10 @@ getTuple(PGconn *conn, PGresult *result, int binary) else { /* get the value length (the first four bytes are for length) */ - pqGetInt(&vlen, VARHDRSZ, pfin, pfdebug); + pqGetInt(&vlen, 4, pfin, pfdebug); if (binary == 0) { - vlen = vlen - VARHDRSZ; + vlen = vlen - 4; } if (vlen < 0) vlen = 0; |