diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-01-28 17:18:23 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-01-28 17:18:42 -0500 |
| commit | c4484232ed3f17c270621eb8ffb974d85023b9ea (patch) | |
| tree | 30a690d813636a0c30a464846b9b048b6231ac37 | |
| parent | 46371600aa2dac11ce6a8bcc314e5e037fb7ff9c (diff) | |
| download | postgresql-c4484232ed3f17c270621eb8ffb974d85023b9ea.tar.gz postgresql-c4484232ed3f17c270621eb8ffb974d85023b9ea.zip | |
Silence another gcc 11 warning.
Per buildfarm and local experimentation, bleeding-edge gcc isn't
convinced that the MemSet in reorder_function_arguments() is safe.
Shut it up by adding an explicit check that pronargs isn't negative,
and by changing MemSet to memset. (It appears that either change is
enough to quiet the warning at -O2, but let's do both to be sure.)
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 5e3ca947ba3..c337d558d49 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -4132,9 +4132,9 @@ reorder_function_arguments(List *args, HeapTuple func_tuple) int i; Assert(nargsprovided <= pronargs); - if (pronargs > FUNC_MAX_ARGS) + if (pronargs < 0 || pronargs > FUNC_MAX_ARGS) elog(ERROR, "too many function arguments"); - MemSet(argarray, 0, pronargs * sizeof(Node *)); + memset(argarray, 0, pronargs * sizeof(Node *)); /* Deconstruct the argument list into an array indexed by argnumber */ i = 0; |