Commit3ace845

committed

Defend against omitted paramLengths[] array in PQsendQueryParams.

Per Volkan Yazici.

1 parent0b8e46e commit3ace845Copy full SHA for 3ace845

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.167 2005/04/29 13:42:21 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.168 2005/06/09 20:01:16 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -30,7 +30,7 @@`
`30`	`30`	`#endif`
`31`	`31`
`32`	`32`	`/* keep this in same order as ExecStatusType in libpq-fe.h */`
`33`		`-char*constpgresStatus[]= {`
	`33`	`+char*constpgresStatus[]= {`
`34`	`34`	`"PGRES_EMPTY_QUERY",`
`35`	`35`	`"PGRES_COMMAND_OK",`
`36`	`36`	`"PGRES_TUPLES_OK",`
`@@ -960,7 +960,14 @@ PQsendQueryGuts(PGconn *conn,`
`960`	`960`	`if (paramFormats&&paramFormats[i]!=0)`
`961`	`961`	`{`
`962`	`962`	`/* binary parameter */`
`963`		`-nbytes=paramLengths[i];`
	`963`	`+if (paramLengths)`
	`964`	`+nbytes=paramLengths[i];`
	`965`	`+else`
	`966`	`+{`
	`967`	`+printfPQExpBuffer(&conn->errorMessage,`
	`968`	`+libpq_gettext("length must be given for binary parameter\n"));`
	`969`	`+gotosendFailed;`
	`970`	`+}`
`964`	`971`	`}`
`965`	`972`	`else`
`966`	`973`	`{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.116 2004/12/31 22:03:50 pgsql Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.117 2005/06/09 20:01:16 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -156,7 +156,7 @@ typedef struct _PQprintOpt`
`156`	`156`	`charfieldSep;/ field separator */`
`157`	`157`	`chartableOpt;/ insert to HTML <table ...> */`
`158`	`158`	`charcaption;/ HTML <caption> */`
`159`		`-char*fieldName;/ null terminated array ofrepalcement`
	`159`	`+char*fieldName;/ null terminated array ofreplacement`
`160`	`160`	`* field names */`
`161`	`161`	`}PQprintOpt;`
`162`	`162`

Comments

(0)