[CF 7292] v1 - [PATCH v1] Reject zero resource kinds in test_resowner_many()

This branch was automatically generated by a robot using patches from an
email thread registered at:

https://commitfest.postgresql.org/patch/7292

The branch will be overwritten each time a new patch version is posted to
the thread, and also periodically to check for bitrot caused by changes
on the master branch.

Patch(es): https://www.postgresql.org/message-id/1905e9d709554733b418d06a4806436f@localhost.localdomain
Author(s): Yuriy Grigoryev

Author: Commitfest Bot

src/test/modules/test_resowner/expected/test_resowner.out

@@ -188,6 +188,11 @@ NOTICE:  releasing string: my string
 
 (1 row)
 
+-- There must be at least one resource kind.
+SELECT test_resowner_many(0, 1, 0, 0, 0);
+ERROR:  nkinds must be greater than zero
+SELECT test_resowner_many(0, 0, 0, 1, 0);
+ERROR:  nkinds must be greater than zero
 -- Negative tests, using a resource owner after release-phase has started.
 set client_min_messages='warning'; -- order between ERROR and NOTICE varies
 SELECT test_resowner_remember_between_phases();

src/test/modules/test_resowner/sql/test_resowner.sql

@@ -18,6 +18,10 @@ SELECT test_resowner_many(
 -- Test resource leak warning
 SELECT test_resowner_leak();
 
+-- There must be at least one resource kind.
+SELECT test_resowner_many(0, 1, 0, 0, 0);
+SELECT test_resowner_many(0, 0, 0, 1, 0);
+
 -- Negative tests, using a resource owner after release-phase has started.
 set client_min_messages='warning'; -- order between ERROR and NOTICE varies
 SELECT test_resowner_remember_between_phases();

src/test/modules/test_resowner/test_resowner_many.c

@@ -118,6 +118,8 @@ RememberManyTestResources(ResourceOwner owner,
 {
 	int			kind_idx = 0;
 
+	Assert(nkinds > 0);
+
 	for (int i = 0; i < nresources; i++)
 	{
 		ManyTestResource *mres = palloc_object(ManyTestResource);
@@ -213,8 +215,8 @@ test_resowner_many(PG_FUNCTION_ARGS)
 	ManyTestResourceKind *after_kinds;
 
 	/* Sanity check the arguments */
-	if (nkinds < 0)
-		elog(ERROR, "nkinds must be >= 0");
+	if (nkinds <= 0)
+		elog(ERROR, "nkinds must be greater than zero");
 	if (nremember_bl < 0)
 		elog(ERROR, "nremember_bl must be >= 0");
 	if (nforget_bl < 0 || nforget_bl > nremember_bl)