Fix a couple of places that were assuming debug_query_string couldn't

tglsfdc · tglsfdc · commit 2315df21f824 · 2006-10-19T19:53:03.000Z
be NULL ... seems an unsafe assumption.
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -8,7 +8,7 @@
  * Darko Prenosil <Darko.Prenosil@finteh.hr>
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.59 2006/10/04 00:29:44 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.60 2006/10/19 19:53:03 tgl Exp $
  * Copyright (c) 2001-2006, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
@@ -1640,7 +1640,10 @@ PG_FUNCTION_INFO_V1(dblink_current_query);
 Datum
 dblink_current_query(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_TEXT_P(GET_TEXT(debug_query_string));
+	if (debug_query_string)
+		PG_RETURN_TEXT_P(GET_TEXT(debug_query_string));
+	else
+		PG_RETURN_NULL();
 }
 
 
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.56 2006/10/04 00:29:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.57 2006/10/19 19:53:03 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -113,7 +113,7 @@ PerformCursorOpen(DeclareCursorStmt *stmt, ParamListInfo params)
 	 */
 	PortalDefineQuery(portal,
 					  NULL,
-					  pstrdup(debug_query_string),
+					  debug_query_string ? pstrdup(debug_query_string) : NULL,
 					  "SELECT", /* cursor's query is always a SELECT */
 					  list_make1(query),
 					  list_make1(plan),

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Darko Prenosil <Darko.Prenosil@finteh.hr>`
`9`	`9`	`* Shridhar Daithankar <shridhar_daithankar@persistent.co.in>`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.59 2006/10/04 00:29:44 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.60 2006/10/19 19:53:03 tgl Exp $`
`12`	`12`	`* Copyright (c) 2001-2006, PostgreSQL Global Development Group`
`13`	`13`	`* ALL RIGHTS RESERVED;`
`14`	`14`	`*`
`@@ -1640,7 +1640,10 @@ PG_FUNCTION_INFO_V1(dblink_current_query);`
`1640`	`1640`	`Datum`
`1641`	`1641`	`dblink_current_query(PG_FUNCTION_ARGS)`
`1642`	`1642`	`{`
`1643`		`- PG_RETURN_TEXT_P(GET_TEXT(debug_query_string));`
	`1643`	`+ if (debug_query_string)`
	`1644`	`+ PG_RETURN_TEXT_P(GET_TEXT(debug_query_string));`
	`1645`	`+ else`
	`1646`	`+ PG_RETURN_NULL();`
`1644`	`1647`	`}`
`1645`	`1648`
`1646`	`1649`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.56 2006/10/04 00:29:51 momjian Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.57 2006/10/19 19:53:03 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -113,7 +113,7 @@ PerformCursorOpen(DeclareCursorStmt *stmt, ParamListInfo params)`
`113`	`113`	`*/`
`114`	`114`	`PortalDefineQuery(portal,`
`115`	`115`	`NULL,`
`116`		`- pstrdup(debug_query_string),`
	`116`	`+ debug_query_string ? pstrdup(debug_query_string) : NULL,`
`117`	`117`	`"SELECT", /* cursor's query is always a SELECT */`
`118`	`118`	`list_make1(query),`
`119`	`119`	`list_make1(plan),`