From: Andrew Dunstan <andrew@dunslane.net>
Date: Wed, 26 Mar 2014 22:20:56 +0000 (-0400)
Subject: Fix uninitialized variables in json's populate_record_worker().
X-Git-Tag: REL9_4_BETA1~270
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=7e4d1600a621ee4e786e715bc82eaad1113dba0e;p=postgresql.git

Fix uninitialized variables in json's populate_record_worker().

Peter Geoghegan.
---

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index bf164677142..73923951e80 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -2160,6 +2160,8 @@ populate_record_worker(FunctionCallInfo fcinfo, bool have_record_arg)
 		my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
 		my_extra->record_type = InvalidOid;
 		my_extra->record_typmod = 0;
+		my_extra->ncolumns = ncolumns;
+		MemSet(my_extra->columns, 0, sizeof(ColumnIOData) * ncolumns);
 	}
 
 	if (have_record_arg && (my_extra->record_type != tupType ||