Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6d493e1

Browse files
committed
Add an Assert that enum_cmp_internal() gets passed an FmgrInfo pointer.
If someone were to try to call one of the enum comparison functionsusing DirectFunctionCallN, it would very likely seem to work, becauseonly in unusual cases does enum_cmp_internal() need to access thetypcache. But once such a case occurred, code like that would crashwith a null pointer dereference. To make an oversight of that sortless likely to escape detection, add a non-bypassable Assert thatfcinfo->flinfo isn't NULL.Discussion:https://postgr.es/m/25226.1487900067@sss.pgh.pa.us
1 parentc29aff9 commit6d493e1

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

‎src/backend/utils/adt/enum.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,15 @@ enum_cmp_internal(Oid arg1, Oid arg2, FunctionCallInfo fcinfo)
263263
{
264264
TypeCacheEntry*tcache;
265265

266+
/*
267+
* We don't need the typcache except in the hopefully-uncommon case that
268+
* one or both Oids are odd. This means that cursory testing of code that
269+
* fails to pass flinfo to an enum comparison function might not disclose
270+
* the oversight. To make such errors more obvious, Assert that we have a
271+
* place to cache even when we take a fast-path exit.
272+
*/
273+
Assert(fcinfo->flinfo!=NULL);
274+
266275
/* Equal OIDs are equal no matter what */
267276
if (arg1==arg2)
268277
return0;
@@ -381,12 +390,7 @@ enum_cmp(PG_FUNCTION_ARGS)
381390
Oida=PG_GETARG_OID(0);
382391
Oidb=PG_GETARG_OID(1);
383392

384-
if (a==b)
385-
PG_RETURN_INT32(0);
386-
elseif (enum_cmp_internal(a,b,fcinfo)>0)
387-
PG_RETURN_INT32(1);
388-
else
389-
PG_RETURN_INT32(-1);
393+
PG_RETURN_INT32(enum_cmp_internal(a,b,fcinfo));
390394
}
391395

392396
/* Enum programming support functions */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp