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

fix/check-memalloc-result

This commit is contained in:
dmchen 2024-09-26 06:59:41 +00:00
parent dfd4fcbf66
commit 9f28140fc5
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/libs/monitorfw/src/taos_metric_formatter_custom.c
View File

@ -40,16 +40,26 @@ int taos_metric_formatter_load_sample_new(taos_metric_formatter_t *self, taos_me
int32_t len = end -start; int32_t len = end -start;
char* keyvalues = taosMemoryMalloc(len); char* keyvalues = taosMemoryMalloc(len);
if (keyvalues == NULL) return 1;
memset(keyvalues, 0, len); memset(keyvalues, 0, len);
memcpy(keyvalues, start + 1, len - 1); memcpy(keyvalues, start + 1, len - 1);
int32_t count = taos_monitor_count_occurrences(keyvalues, ","); int32_t count = taos_monitor_count_occurrences(keyvalues, ",");
char** keyvalue = taosMemoryMalloc(sizeof(char*) * (count + 1)); char** keyvalue = taosMemoryMalloc(sizeof(char*) * (count + 1));
if (keyvalue == NULL) {
taosMemoryFreeClear(keyvalues);
return 1;
}
memset(keyvalue, 0, sizeof(char*) * (count + 1)); memset(keyvalue, 0, sizeof(char*) * (count + 1));
taos_monitor_split_str(keyvalue, keyvalues, ","); taos_monitor_split_str(keyvalue, keyvalues, ",");
char** arr = taosMemoryMalloc(sizeof(char*) * (count + 1) * 2); char** arr = taosMemoryMalloc(sizeof(char*) * (count + 1) * 2);
if (arr == NULL) {
taosMemoryFreeClear(keyvalue);
taosMemoryFreeClear(keyvalues);
return 1;
}
memset(arr, 0, sizeof(char*) * (count + 1) * 2); memset(arr, 0, sizeof(char*) * (count + 1) * 2);
bool isfound = true; bool isfound = true;
@ -165,6 +175,7 @@ int taos_metric_formatter_load_metric_new(taos_metric_formatter_t *self, taos_me
int32_t size = strlen(metric->name); int32_t size = strlen(metric->name);
char* name = taosMemoryMalloc(size + 1); char* name = taosMemoryMalloc(size + 1);
if (name == NULL) return 1;
memset(name, 0, size + 1); memset(name, 0, size + 1);
memcpy(name, metric->name, size); memcpy(name, metric->name, size);
char* arr[2] = {0}; //arr[0] is table name, arr[1] is metric name char* arr[2] = {0}; //arr[0] is table name, arr[1] is metric name

1
source/libs/monitorfw/src/taos_monitor_util.c
View File

@ -37,6 +37,7 @@ void taos_monitor_split_str(char** arr, char* str, const char* del) {
void taos_monitor_split_str_metric(char** arr, taos_metric_t* metric, const char* del, char** buf) { void taos_monitor_split_str_metric(char** arr, taos_metric_t* metric, const char* del, char** buf) {
int32_t size = strlen(metric->name); int32_t size = strlen(metric->name);
char* name = taosMemoryMalloc(size + 1); char* name = taosMemoryMalloc(size + 1);
if (name == NULL) return;
memset(name, 0, size + 1); memset(name, 0, size + 1);
memcpy(name, metric->name, size); memcpy(name, metric->name, size);