mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
be NULL ... seems an unsafe assumption.
This commit is contained in:
Tom Lane 2006-10-19 19:53:03 +00:00
parent 681892208f
commit 2315df21f8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/dblink/dblink.c
View File

@ -8,7 +8,7 @@
* Darko Prenosil <Darko.Prenosil@finteh.hr> * Darko Prenosil <Darko.Prenosil@finteh.hr>
* Shridhar Daithankar <shridhar_daithankar@persistent.co.in> * 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 * Copyright (c) 2001-2006, PostgreSQL Global Development Group
* ALL RIGHTS RESERVED; * ALL RIGHTS RESERVED;
* *
@ -1640,7 +1640,10 @@ PG_FUNCTION_INFO_V1(dblink_current_query);
Datum Datum
dblink_current_query(PG_FUNCTION_ARGS) dblink_current_query(PG_FUNCTION_ARGS)
{ {
if (debug_query_string)
PG_RETURN_TEXT_P(GET_TEXT(debug_query_string)); PG_RETURN_TEXT_P(GET_TEXT(debug_query_string));
else
PG_RETURN_NULL();
} }

4
src/backend/commands/portalcmds.c
View File

@ -14,7 +14,7 @@
* *
* *
* IDENTIFICATION * 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, PortalDefineQuery(portal,
NULL, NULL,
pstrdup(debug_query_string), debug_query_string ? pstrdup(debug_query_string) : NULL,
"SELECT", /* cursor's query is always a SELECT */ "SELECT", /* cursor's query is always a SELECT */
list_make1(query), list_make1(query),
list_make1(plan), list_make1(plan),