From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 13 Sep 2011 15:36:53 +0000 (-0400)
Subject: deflist_to_tuplestore dumped core on an option with no value.
X-Git-Tag: REL9_1_1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663bee0d5c1e3ff2380377c7894499ae91eabd87;p=postgresql

deflist_to_tuplestore dumped core on an option with no value.

Make it return NULL for the option_value, instead.

Per report from Frank van Vugt.  Back-patch to 8.4 where this code was
added.
---

diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index 4a7b2c30cf..269a9ad82f 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -371,8 +371,17 @@ deflist_to_tuplestore(ReturnSetInfo *rsinfo, List *options)
 		DefElem    *def = lfirst(cell);
 
 		values[0] = CStringGetTextDatum(def->defname);
-		values[1] = CStringGetTextDatum(((Value *) def->arg)->val.str);
-		nulls[0] = nulls[1] = false;
+		nulls[0] = false;
+		if (def->arg)
+		{
+			values[1] = CStringGetTextDatum(((Value *) (def->arg))->val.str);
+			nulls[1] = false;
+		}
+		else
+		{
+			values[1] = (Datum) 0;
+			nulls[1] = true;
+		}
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
 	}