From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 22 Jun 2017 03:19:13 +0000 (-0400)
Subject: Teach pgrowlocks to check relkind before scanning
X-Git-Tag: REL_10_BETA2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b56818abd450a87e2e3cb03b2cf3eede73487926;p=thirdparty%2Fpostgresql.git

Teach pgrowlocks to check relkind before scanning

Author: Amit Langote <Langote_Amit_f8@lab.ntt.co.jp>
---

diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index a50ef67b477..eabca65bd2e 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -97,7 +97,19 @@ pgrowlocks(PG_FUNCTION_ARGS)
 
 		relname = PG_GETARG_TEXT_PP(0);
 		relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
-		rel = heap_openrv(relrv, AccessShareLock);
+		rel = relation_openrv(relrv, AccessShareLock);
+
+		if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is a partitioned table",
+							RelationGetRelationName(rel)),
+					 errdetail("Partitioned tables do not contain rows.")));
+		else if (rel->rd_rel->relkind != RELKIND_RELATION)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("\"%s\" is not a table",
+							RelationGetRelationName(rel))));
 
 		/*
 		 * check permissions: must have SELECT on table or be in