external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2561 from citusdata/run-time-bound-check 

Move an assert-only array-bound check to run-time.
pull/2563/head
Marco Slot 2018-12-20 17:09:04 +01:00 committed by GitHub
parent 13f4a0ac9f 6a1a2b8458
commit 8a54999c5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/distributed/connection/connection_configuration.c
View File

@ -100,7 +100,12 @@ ResetConnParams()
void void
AddConnParam(const char *keyword, const char *value) AddConnParam(const char *keyword, const char *value)
{ {
Assert((ConnParams.size + 1) < ConnParams.maxSize); if (ConnParams.size + 1 >= ConnParams.maxSize)
{
/* we expect developers to see that error messages */
ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_RESOURCES),
errmsg("ConnParams arrays bound check failed")));
}
ConnParams.keywords[ConnParams.size] = strdup(keyword); ConnParams.keywords[ConnParams.size] = strdup(keyword);
ConnParams.values[ConnParams.size] = strdup(value); ConnParams.values[ConnParams.size] = strdup(value);
@ -263,7 +268,7 @@ GetConnParams(ConnectionHashKey *key, char ***keywords, char ***values,
int paramIndex = 0; int paramIndex = 0;
int runtimeParamIndex = 0; int runtimeParamIndex = 0;
if (ConnParams.size + lengthof(runtimeKeywords) > ConnParams.maxSize) if (ConnParams.size + lengthof(runtimeKeywords) >= ConnParams.maxSize)
{ {
/* unexpected, intended as developers rather than users */ /* unexpected, intended as developers rather than users */
ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),