diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-13 11:36:53 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-09-13 11:36:53 -0400 |
commit | 663bee0d5c1e3ff2380377c7894499ae91eabd87 (patch) | |
tree | a174317bba28f3cc57f7c9a08cf7d8d3f3bf9582 | |
parent | 1f43001424a9da624a89b213d0be606a8212a50a (diff) | |
download | postgresql-663bee0d5c1e3ff2380377c7894499ae91eabd87.tar.gz |
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.
-rw-r--r-- | src/backend/foreign/foreign.c | 13 |
1 files changed, 11 insertions, 2 deletions
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); } |