xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: check memory calloc

This commit is contained in:
Shengliang Guan 2024-11-04 11:53:24 +08:00
parent 07f7b57cd7
commit 031146b3b5
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/libs/function/src/tudf.c
View File

@ -77,6 +77,8 @@ void udfUdfdExit(uv_process_t *process, int64_t exitStatus, int32_t termSignal)
static int32_t udfSpawnUdfd(SUdfdData *pData) { static int32_t udfSpawnUdfd(SUdfdData *pData) {
fnInfo("start to init udfd"); fnInfo("start to init udfd");
int32_t err = 0;
uv_process_options_t options = {0}; uv_process_options_t options = {0};
char path[PATH_MAX] = {0}; char path[PATH_MAX] = {0};
@ -177,22 +179,39 @@ static int32_t udfSpawnUdfd(SUdfdData *pData) {
char **envUdfdWithPEnv = NULL; char **envUdfdWithPEnv = NULL;
if (environ != NULL) { if (environ != NULL) {
int32_t lenEnvUdfd = ARRAY_SIZE(envUdfd);
int32_t numEnviron = 0; int32_t numEnviron = 0;
while (environ[numEnviron] != NULL) { while (environ[numEnviron] != NULL) {
numEnviron++; numEnviron++;
} }
int32_t lenEnvUdfd = ARRAY_SIZE(envUdfd);
envUdfdWithPEnv = (char **)taosMemoryMalloc((numEnviron + lenEnvUdfd) * sizeof(char *)); envUdfdWithPEnv = (char **)taosMemoryCalloc(numEnviron + lenEnvUdfd, sizeof(char *));
if (envUdfdWithPEnv == NULL) {
err = TSDB_CODE_OUT_OF_MEMORY;
goto _OVER;
}
for (int32_t i = 0; i < numEnviron; i++) { for (int32_t i = 0; i < numEnviron; i++) {
envUdfdWithPEnv[i] = (char *)taosMemoryMalloc(strlen(environ[i]) + 1); int32_t len = strlen(environ[i]) + 1;
strcpy(envUdfdWithPEnv[i], environ[i]); envUdfdWithPEnv[i] = (char *)taosMemoryCalloc(len, 1);
if (envUdfdWithPEnv[i] == NULL) {
err = TSDB_CODE_OUT_OF_MEMORY;
goto _OVER;
}
tstrncpy(envUdfdWithPEnv[i], environ[i], len);
} }
for (int32_t i = 0; i < lenEnvUdfd; i++) { for (int32_t i = 0; i < lenEnvUdfd; i++) {
if (envUdfd[i] != NULL) { if (envUdfd[i] != NULL) {
envUdfdWithPEnv[numEnviron + i] = (char *)taosMemoryMalloc(strlen(envUdfd[i]) + 1); int32_t len = strlen(envUdfd[i]) + 1;
strcpy(envUdfdWithPEnv[numEnviron + i], envUdfd[i]); envUdfdWithPEnv[numEnviron + i] = (char *)taosMemoryCalloc(len, 1);
if (envUdfdWithPEnv[numEnviron + i] == NULL) {
err = TSDB_CODE_OUT_OF_MEMORY;
goto _OVER;
}
tstrncpy(envUdfdWithPEnv[numEnviron + i], envUdfd[i], len);
} }
} }
envUdfdWithPEnv[numEnviron + lenEnvUdfd - 1] = NULL; envUdfdWithPEnv[numEnviron + lenEnvUdfd - 1] = NULL;
@ -202,7 +221,7 @@ static int32_t udfSpawnUdfd(SUdfdData *pData) {
options.env = envUdfd; options.env = envUdfd;
} }
int32_t err = uv_spawn(&pData->loop, &pData->process, &options); err = uv_spawn(&pData->loop, &pData->process, &options);
pData->process.data = (void *)pData; pData->process.data = (void *)pData;
#ifdef WINDOWS #ifdef WINDOWS
@ -230,6 +249,7 @@ static int32_t udfSpawnUdfd(SUdfdData *pData) {
fnInfo("udfd is initialized"); fnInfo("udfd is initialized");
} }
_OVER:
if (taosFqdnEnvItem) { if (taosFqdnEnvItem) {
taosMemoryFree(taosFqdnEnvItem); taosMemoryFree(taosFqdnEnvItem);
} }