libpq's pqGetnchar() should not return a null-terminated value

bmomjian · bmomjian · commit 3e873022014d · 1998-08-29T02:09:27.000Z
anymore.  Fix for large objects.
diff --git 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.62 1998/08/17 03:50:35 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.63 1998/08/29 02:09:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -612,6 +612,7 @@ getAnotherTuple(PGconn *conn, int binary)
 			if (vlen > 0)
 				if (pqGetnchar((char *) (tup[i].value), vlen, conn))
 					return EOF;
+			/* we have to terminate this ourselves */
 			tup[i].value[vlen] = '\0';
 		}
 		/* advance the bitmap stuff */
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
@@ -24,7 +24,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.18 1998/08/17 03:50:38 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.19 1998/08/29 02:09:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -160,8 +160,7 @@ pqPuts(const char *s, PGconn *conn)
 
 /* --------------------------------------------------------------------- */
 /* pqGetnchar:
-   get a string of exactly len bytes in buffer s (which must be 1 byte
-   longer) and terminate it with a '\0'.
+   get a string of exactly len bytes in buffer s, no null termination
 */
 int
 pqGetnchar(char *s, int len, PGconn *conn)
@@ -170,8 +169,8 @@ pqGetnchar(char *s, int len, PGconn *conn)
 		return EOF;
 
 	memcpy(s, conn->inBuffer + conn->inCursor, len);
-	s[len] = '\0';
-
+	/* no terminating null */
+	
 	conn->inCursor += len;
 
 	if (conn->Pfdebug)
diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
@@ -11,3 +11,5 @@ update include/version.h after release
 update backend/parser/scan.c and gram.c so  flex/bison not necessary
 update pgaccess
 update odbc
+update doc/src/sgml/release.sgml 
+

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.62 1998/08/17 03:50:35 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.63 1998/08/29 02:09:24 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -612,6 +612,7 @@ getAnotherTuple(PGconn *conn, int binary)`
`612`	`612`	`if (vlen > 0)`
`613`	`613`	`if (pqGetnchar((char *) (tup[i].value), vlen, conn))`
`614`	`614`	`return EOF;`
	`615`	`+ /* we have to terminate this ourselves */`
`615`	`616`	`tup[i].value[vlen] = '\0';`
`616`	`617`	`}`
`617`	`618`	`/* advance the bitmap stuff */`