Fix incorrect placement of pfree() in pg_relation_check_pages()

michaelpq · michaelpq · commit 60a51c6b3296 · 2020-10-29T09:17:34.000+09:00
This would cause the function to crash when more than one page is considered as broken and reported in the SRF. Reported-by: Noriyoshi Shinoda Discussion: https://postgr.es/m/TU4PR8401MB11523D42C315AAF822E74275EE170@TU4PR8401MB1152.NAMPRD84.PROD.OUTLOOK.COM
diff --git a/src/backend/utils/adt/pagefuncs.c b/src/backend/utils/adt/pagefuncs.c
@@ -220,10 +220,10 @@ check_relation_fork(TupleDesc tupdesc, Tuplestorestate *tupstore,
 
 		/* Save the corrupted blocks in the tuplestore. */
 		tuplestore_putvalues(tupstore, tupdesc, values, nulls);
-
-		pfree(path);
 	}
 
+	pfree(path);
+
 	/* Pop the error context stack */
 	error_context_stack = errcallback.previous;
 }

Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,10 @@ check_relation_fork(TupleDesc tupdesc, Tuplestorestate *tupstore,`
`220`	`220`
`221`	`221`	`/* Save the corrupted blocks in the tuplestore. */`
`222`	`222`	`tuplestore_putvalues(tupstore, tupdesc, values, nulls);`
`223`		`-`
`224`		`- pfree(path);`
`225`	`223`	`}`
`226`	`224`
	`225`	`+ pfree(path);`
	`226`	`+`
`227`	`227`	`/* Pop the error context stack */`
`228`	`228`	`error_context_stack = errcallback.previous;`
`229`	`229`	`}`