Commit3e87302

committed

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

anymore. Fix for large objects.

1 parentb9b00d5 commit3e87302Copy full SHA for 3e87302

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 1 deletion

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`	`returnEOF;`
	`615`	`+/* we have to terminate this ourselves */`
`615`	`616`	`tup[i].value[vlen]='\0';`
`616`	`617`	`}`
`617`	`618`	`/* advance the bitmap stuff */`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`*`
`26`	`26`	`* IDENTIFICATION`
`27`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.18 1998/08/17 03:50:38 scrappy Exp $`
	`27`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.19 1998/08/29 02:09:25 momjian Exp $`
`28`	`28`	`*`
`29`	`29`	`*-------------------------------------------------------------------------`
`30`	`30`	`*/`
`@@ -160,8 +160,7 @@ pqPuts(const char s, PGconn conn)`
`160`	`160`
`161`	`161`	`/* --------------------------------------------------------------------- */`
`162`	`162`	`/* pqGetnchar:`
`163`		`- get a string of exactly len bytes in buffer s (which must be 1 byte`
`164`		`- longer) and terminate it with a '\0'.`
	`163`	`+ get a string of exactly len bytes in buffer s, no null termination`
`165`	`164`	`*/`
`166`	`165`	`int`
`167`	`166`	`pqGetnchar(chars,intlen,PGconnconn)`
`@@ -170,8 +169,8 @@ pqGetnchar(char s, int len, PGconn conn)`
`170`	`169`	`returnEOF;`
`171`	`170`
`172`	`171`	`memcpy(s,conn->inBuffer+conn->inCursor,len);`
`173`		`-s[len]='\0';`
`174`		`-`
	`172`	`+/* no terminating null */`
	`173`	`+`
`175`	`174`	`conn->inCursor+=len;`
`176`	`175`
`177`	`176`	`if (conn->Pfdebug)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,5 @@ update include/version.h after release`
`11`	`11`	`update backend/parser/scan.c and gram.c so flex/bison not necessary`
`12`	`12`	`update pgaccess`
`13`	`13`	`update odbc`
	`14`	`+update doc/src/sgml/release.sgml`
	`15`	`+`

Comments

(0)