Defend against omitted paramLengths[] array in PQsendQueryParams.

tglsfdc · tglsfdc · commit 3ace84594e36 · 2005-06-09T20:01:16.000Z
Per Volkan Yazici.
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.167 2005/04/29 13:42:21 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.168 2005/06/09 20:01:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,7 +30,7 @@
 #endif
 
 /* keep this in same order as ExecStatusType in libpq-fe.h */
-char	   *const pgresStatus[] = {
+char *const pgresStatus[] = {
 	"PGRES_EMPTY_QUERY",
 	"PGRES_COMMAND_OK",
 	"PGRES_TUPLES_OK",
@@ -960,7 +960,14 @@ PQsendQueryGuts(PGconn *conn,
 			if (paramFormats && paramFormats[i] != 0)
 			{
 				/* binary parameter */
-				nbytes = paramLengths[i];
+				if (paramLengths)
+					nbytes = paramLengths[i];
+				else
+				{
+					printfPQExpBuffer(&conn->errorMessage,
+									  libpq_gettext("length must be given for binary parameter\n"));
+					goto sendFailed;
+				}
 			}
 			else
 			{
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.116 2004/12/31 22:03:50 pgsql Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.117 2005/06/09 20:01:16 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -156,7 +156,7 @@ typedef struct _PQprintOpt
 	char	   *fieldSep;		/* field separator */
 	char	   *tableOpt;		/* insert to HTML <table ...> */
 	char	   *caption;		/* HTML <caption> */
-	char	  **fieldName;		/* null terminated array of repalcement
+	char	  **fieldName;		/* null terminated array of replacement
 								 * field names */
 } PQprintOpt;
 

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 *const pgresStatus[] = {`
	`33`	`+char *const pgresStatus[] = {`
`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`	`+ goto sendFailed;`
	`970`	`+ }`
`964`	`971`	`}`
`965`	`972`	`else`
`966`	`973`	`{`