Fix NULL path entry case

Nikita Glukhov · Nikita Glukhov · commit 8aaa285b55ed · 2022-03-11T00:52:04.000+03:00
diff --git a/src/backend/utils/adt/jsonb_selfuncs.c b/src/backend/utils/adt/jsonb_selfuncs.c
@@ -941,7 +941,7 @@ jsonbStatsVarOpConst(Oid opid, VariableStatData *resdata,
 			Datum	   *path;
 			bool	   *nulls;
 			int			pathlen;
-			int			i;
+			bool		have_nulls = false;
 
 			if (cnst->consttype != TEXTARRAYOID)
 			{
@@ -952,18 +952,18 @@ jsonbStatsVarOpConst(Oid opid, VariableStatData *resdata,
 			deconstruct_array(DatumGetArrayTypeP(cnst->constvalue), TEXTOID,
 							  -1, false, 'i', &path, &nulls, &pathlen);
 
-			for (i = 0; i < pathlen; i++)
+			for (int i = 0; i < pathlen; i++)
 			{
 				if (nulls[i])
 				{
-					pfree(path);
-					pfree(nulls);
-					PG_RETURN_VOID();
+					have_nulls = true;
+					break;
 				}
 			}
 
-			resdata->statsTuple =
-				jsonStatsGetPathStatsTuple(&jsdata, statype, path, pathlen);
+			if (!have_nulls)
+				resdata->statsTuple =
+					jsonStatsGetPathStatsTuple(&jsdata, statype, path, pathlen);
 
 			pfree(path);
 			pfree(nulls);

Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ jsonbStatsVarOpConst(Oid opid, VariableStatData *resdata,`
`941`	`941`	`Datum *path;`
`942`	`942`	`bool *nulls;`
`943`	`943`	`int pathlen;`
`944`		`- int i;`
	`944`	`+ bool have_nulls = false;`
`945`	`945`
`946`	`946`	`if (cnst->consttype != TEXTARRAYOID)`
`947`	`947`	`{`
`@@ -952,18 +952,18 @@ jsonbStatsVarOpConst(Oid opid, VariableStatData *resdata,`
`952`	`952`	`deconstruct_array(DatumGetArrayTypeP(cnst->constvalue), TEXTOID,`
`953`	`953`	`-1, false, 'i', &path, &nulls, &pathlen);`
`954`	`954`
`955`		`- for (i = 0; i < pathlen; i++)`
	`955`	`+ for (int i = 0; i < pathlen; i++)`
`956`	`956`	`{`
`957`	`957`	`if (nulls[i])`
`958`	`958`	`{`
`959`		`- pfree(path);`
`960`		`- pfree(nulls);`
`961`		`- PG_RETURN_VOID();`
	`959`	`+ have_nulls = true;`
	`960`	`+ break;`
`962`	`961`	`}`
`963`	`962`	`}`
`964`	`963`
`965`		`- resdata->statsTuple =`
`966`		`- jsonStatsGetPathStatsTuple(&jsdata, statype, path, pathlen);`
	`964`	`+ if (!have_nulls)`
	`965`	`+ resdata->statsTuple =`
	`966`	`+ jsonStatsGetPathStatsTuple(&jsdata, statype, path, pathlen);`
`967`	`967`
`968`	`968`	`pfree(path);`
`969`	`969`	`pfree(nulls);`