rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some assertions to view reloption macros 

In these macros, the rd_options pointer is cast to ViewOption *.  Add
some assertions that the passed-in relation is actually a view before
doing that.

Author: Nikolay Shaplov <dhyan@nataraj.su>
Discussion: https://www.postgresql.org/message-id/flat/3634983.eHpMQ1mJnI@x200m
This commit is contained in:
Peter Eisentraut 2019-11-01 13:16:21 +01:00
parent 604bd36711
commit 3967737624
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/include/utils/rel.h
View File

@ -351,9 +351,10 @@ typedef struct ViewOptions
* Returns whether the relation is security view, or not. Note multiple * Returns whether the relation is security view, or not. Note multiple
* eval of argument! * eval of argument!
*/ */
#define RelationIsSecurityView(relation) \ #define RelationIsSecurityView(relation) \
((relation)->rd_options ? \ (AssertMacro(relation->rd_rel->relkind == RELKIND_VIEW), \
((ViewOptions *) (relation)->rd_options)->security_barrier : false) (relation)->rd_options ? \
((ViewOptions *) (relation)->rd_options)->security_barrier : false)
/* /*
* RelationHasCheckOption * RelationHasCheckOption
@ -361,7 +362,8 @@ typedef struct ViewOptions
* or the cascaded check option. Note multiple eval of argument! * or the cascaded check option. Note multiple eval of argument!
*/ */
#define RelationHasCheckOption(relation) \ #define RelationHasCheckOption(relation) \
((relation)->rd_options && \ (AssertMacro(relation->rd_rel->relkind == RELKIND_VIEW), \
(relation)->rd_options && \
((ViewOptions *) (relation)->rd_options)->check_option != \ ((ViewOptions *) (relation)->rd_options)->check_option != \
VIEW_OPTION_CHECK_OPTION_NOT_SET) VIEW_OPTION_CHECK_OPTION_NOT_SET)
@ -371,7 +373,8 @@ typedef struct ViewOptions
* option. Note multiple eval of argument! * option. Note multiple eval of argument!
*/ */
#define RelationHasLocalCheckOption(relation) \ #define RelationHasLocalCheckOption(relation) \
((relation)->rd_options && \ (AssertMacro(relation->rd_rel->relkind == RELKIND_VIEW), \
(relation)->rd_options && \
((ViewOptions *) (relation)->rd_options)->check_option == \ ((ViewOptions *) (relation)->rd_options)->check_option == \
VIEW_OPTION_CHECK_OPTION_LOCAL) VIEW_OPTION_CHECK_OPTION_LOCAL)
@ -381,7 +384,8 @@ typedef struct ViewOptions
* option. Note multiple eval of argument! * option. Note multiple eval of argument!
*/ */
#define RelationHasCascadedCheckOption(relation) \ #define RelationHasCascadedCheckOption(relation) \
((relation)->rd_options && \ (AssertMacro(relation->rd_rel->relkind == RELKIND_VIEW), \
(relation)->rd_options && \
((ViewOptions *) (relation)->rd_options)->check_option == \ ((ViewOptions *) (relation)->rd_options)->check_option == \
VIEW_OPTION_CHECK_OPTION_CASCADED) VIEW_OPTION_CHECK_OPTION_CASCADED)