diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 00:11:42 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-02-20 00:11:42 -0500 |
| commit | 09d8d110a604e52216102e73fb8475b7aa88f1d1 (patch) | |
| tree | 6ffdaba34c52c319aa32b3cb95cc93cdcefb6d65 /src/backend/commands | |
| parent | 2fb7a75f37d0beca80f45e15736ec8d50064228a (diff) | |
| download | postgresql-09d8d110a604e52216102e73fb8475b7aa88f1d1.tar.gz postgresql-09d8d110a604e52216102e73fb8475b7aa88f1d1.zip | |
Use FLEXIBLE_ARRAY_MEMBER in a bunch more places.
Replace some bogus "x[1]" declarations with "x[FLEXIBLE_ARRAY_MEMBER]".
Aside from being more self-documenting, this should help prevent bogus
warnings from static code analyzers and perhaps compiler misoptimizations.
This patch is just a down payment on eliminating the whole problem, but
it gets rid of a lot of easy-to-fix cases.
Note that the main problem with doing this is that one must no longer rely
on computing sizeof(the containing struct), since the result would be
compiler-dependent. Instead use offsetof(struct, lastfield). Autoconf
also warns against spelling that offsetof(struct, lastfield[0]).
Michael Paquier, review and additional fixes by me.
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/prepare.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index 71b08f01bf3..fb33d305aff 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -383,10 +383,9 @@ EvaluateParams(PreparedStatement *pstmt, List *params, /* Prepare the expressions for execution */ exprstates = (List *) ExecPrepareExpr((Expr *) params, estate); - /* sizeof(ParamListInfoData) includes the first array element */ paramLI = (ParamListInfo) - palloc(sizeof(ParamListInfoData) + - (num_params - 1) * sizeof(ParamExternData)); + palloc(offsetof(ParamListInfoData, params) + + num_params * sizeof(ParamExternData)); /* we have static list of params, so no hooks needed */ paramLI->paramFetch = NULL; paramLI->paramFetchArg = NULL; |