git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Add an Assert that enum_cmp_internal() gets passed an FmgrInfo pointer.

2017年2月24日 03:08:10 +0000 (22:08 -0500)

If someone were to try to call one of the enum comparison functions
using DirectFunctionCallN, it would very likely seem to work, because
only in unusual cases does enum_cmp_internal() need to access the
typcache. But once such a case occurred, code like that would crash
with a null pointer dereference. To make an oversight of that sort
less likely to escape detection, add a non-bypassable Assert that
fcinfo->flinfo isn't NULL.

Discussion: https://postgr.es/m/25226.1487900067@sss.pgh.pa.us

src/backend/utils/adt/enum.c patch | blob | blame | history

diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c

index 8110ee222c15dced9b78a781a06326e474d1b906..b1d2a6f0c3b79715a03b8396192de88125936b37 100644 (file)

--- a/src/backend/utils/adt/enum.c

+++ b/src/backend/utils/adt/enum.c

@@ -263,6 +263,15 @@ enum_cmp_internal(Oid arg1, Oid arg2, FunctionCallInfo fcinfo)

{

TypeCacheEntry *tcache;

+ /*

+ * We don't need the typcache except in the hopefully-uncommon case that

+ * one or both Oids are odd. This means that cursory testing of code that

+ * fails to pass flinfo to an enum comparison function might not disclose