Fix uninitialized variables in json's populate_record_worker().

adunstan · adunstan · commit 7e4d1600a621 · 2014-03-26T18:20:56.000-04:00
Peter Geoghegan.
diff --git 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 ||

Original file line number	Diff line number	Diff line change
`@@ -2160,6 +2160,8 @@ populate_record_worker(FunctionCallInfo fcinfo, bool have_record_arg)`
`2160`	`2160`	`my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;`
`2161`	`2161`	`my_extra->record_type = InvalidOid;`
`2162`	`2162`	`my_extra->record_typmod = 0;`
	`2163`	`+ my_extra->ncolumns = ncolumns;`
	`2164`	`+ MemSet(my_extra->columns, 0, sizeof(ColumnIOData) * ncolumns);`
`2163`	`2165`	`}`
`2164`	`2166`
`2165`	`2167`	`if (have_record_arg && (my_extra->record_type != tupType \|\|`