diff --git a/src/backend/distributed/utils/attribute.c b/src/backend/distributed/utils/attribute.c index 448efb76c..3e564d045 100644 --- a/src/backend/distributed/utils/attribute.c +++ b/src/backend/distributed/utils/attribute.c @@ -585,8 +585,13 @@ MultiTenantMonitorshmemSize(void) static char * extractTopComment(const char *inputString) { - int i = 0; + int commentStartCharsLength = 2; + if (strlen(inputString) < commentStartCharsLength ) + { + return NULL; + } + int i = 0; /* If query starts with a comment */ if (inputString[i] == '/' && inputString[i + 1] == '*') { @@ -598,9 +603,9 @@ extractTopComment(const char *inputString) } } - if (i > 2) + if (i > commentStartCharsLength) { - return get_substring(inputString, 2, i); + return get_substring(inputString, commentStartCharsLength, i); } else {