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

fix(analytics): fix bugs in recv post results.

This commit is contained in:
Haojun Liao 2024-12-23 16:41:50 +08:00
parent 9cb81284f6
commit ac6c6278b7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/util/src/tanalytics.c
View File

@ -216,30 +216,33 @@ static size_t taosCurlWriteData(char *pCont, size_t contLen, size_t nmemb, void
return 0; return 0;
} }
int64_t size = pRsp->dataLen + (int64_t)contLen * nmemb; int64_t newDataSize = (int64_t) contLen * nmemb;
int64_t size = pRsp->dataLen + newDataSize;
if (pRsp->data == NULL) { if (pRsp->data == NULL) {
pRsp->data = taosMemoryMalloc(size + 1); pRsp->data = taosMemoryMalloc(size + 1);
if (pRsp->data == NULL) { if (pRsp->data == NULL) {
uError("failed to prepare recv buffer for post rsp, len:%d, code:%s", (int32_t) size + 1, tstrerror(terrno)); uError("failed to prepare recv buffer for post rsp, len:%d, code:%s", (int32_t) size + 1, tstrerror(terrno));
return terrno; return 0; // return the recv length, if failed, return 0
} }
} else { } else {
char* p = taosMemoryRealloc(pRsp->data, size + 1); char* p = taosMemoryRealloc(pRsp->data, size + 1);
if (p == NULL) { if (p == NULL) {
uError("failed to prepare recv buffer for post rsp, len:%d, code:%s", (int32_t) size + 1, tstrerror(terrno)); uError("failed to prepare recv buffer for post rsp, len:%d, code:%s", (int32_t) size + 1, tstrerror(terrno));
return terrno; return 0; // return the recv length, if failed, return 0
} }
pRsp->data = p; pRsp->data = p;
} }
if (pRsp->data != NULL) { if (pRsp->data != NULL) {
(void)memcpy(pRsp->data + pRsp->dataLen, pCont, pRsp->dataLen); (void)memcpy(pRsp->data + pRsp->dataLen, pCont, newDataSize);
pRsp->data[pRsp->dataLen] = 0;
pRsp->dataLen = size;
uDebugL("curl response is received, len:%" PRId64 ", content:%s", pRsp->dataLen, pRsp->data); pRsp->dataLen = size;
return pRsp->dataLen; pRsp->data[size] = 0;
uDebugL("curl response is received, len:%" PRId64 ", content:%s", size, pRsp->data);
return newDataSize;
} else { } else {
pRsp->dataLen = 0; pRsp->dataLen = 0;
uError("failed to malloc curl response"); uError("failed to malloc curl response");