hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!4333 修复create trigger存在潜在内存越界问题

Browse Source 
Merge pull request !4333 from pengjiong/fix_ci
This commit is contained in:
opengauss_bot
2023-10-23 12:04:18 +00:00
committed by Gitee
parent 95816afb82 2e62b87746
commit 1983fc6ffa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gausskernel/optimizer/commands/trigger.cpp
View File

@ -545,10 +545,11 @@ ObjectAddress CreateTrigger(CreateTrigStmt* stmt, const char* queryString, Oid r
n->parameters = NULL; n->parameters = NULL;
n->returnType = makeTypeName("trigger"); n->returnType = makeTypeName("trigger");
const char* inlineProcessDesc = " return NEW;end"; const char* inlineProcessDesc = " return NEW;end";
size_t bodySrcTempSize = strlen(stmt->funcSource->bodySrc) + strlen(inlineProcessDesc); size_t originBodyLen = strlen(stmt->funcSource->bodySrc);
size_t bodySrcTempSize = originBodyLen + strlen(inlineProcessDesc) + 1;
char* bodySrcTemp = (char*)palloc(bodySrcTempSize); char* bodySrcTemp = (char*)palloc(bodySrcTempSize);
int last_end = -1; int last_end = -1;
for (int i = bodySrcTempSize - 3; i > 0; i--) { for (int i = originBodyLen - 3; i > 0; i--) {
if (pg_strncasecmp(stmt->funcSource->bodySrc + i, "end", strlen("end")) == 0) { if (pg_strncasecmp(stmt->funcSource->bodySrc + i, "end", strlen("end")) == 0) {
last_end = i; last_end = i;
break; break;
@ -559,10 +560,10 @@ ObjectAddress CreateTrigger(CreateTrigStmt* stmt, const char* queryString, Oid r
errmsg("trigger function body has syntax error"))); errmsg("trigger function body has syntax error")));
} }
ret = memcpy_s(bodySrcTemp, bodySrcTempSize, stmt->funcSource->bodySrc, last_end); ret = memcpy_s(bodySrcTemp, bodySrcTempSize, stmt->funcSource->bodySrc, last_end);
securec_check_c(ret, "\0", "\0"); securec_check(ret, "\0", "\0");
bodySrcTemp[last_end] = '\0'; bodySrcTemp[last_end] = '\0';
ret = strcat_s(bodySrcTemp, bodySrcTempSize, inlineProcessDesc); ret = strcat_s(bodySrcTemp, bodySrcTempSize, inlineProcessDesc);
securec_check_c(ret, "\0", "\0"); securec_check(ret, "\0", "\0");
n->options = lappend(n->options, makeDefElem("as", (Node*)list_make1(makeString(bodySrcTemp)))); n->options = lappend(n->options, makeDefElem("as", (Node*)list_make1(makeString(bodySrcTemp))));
n->options = lappend(n->options, makeDefElem("language", (Node*)makeString("plpgsql"))); n->options = lappend(n->options, makeDefElem("language", (Node*)makeString("plpgsql")));
n->withClause = NIL; n->withClause = NIL;