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

fix: fix the var data len

This commit is contained in:
Cary Xu 2022-07-02 16:01:19 +08:00
parent 9fab97a01e
commit ef7a25fdc3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/common/src/trow.c
View File

@ -1238,13 +1238,13 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
varDataLen += sizeof(VarDataLenT); varDataLen += sizeof(VarDataLenT);
if (pTColumn->type == TSDB_DATA_TYPE_VARCHAR) { if (pTColumn->type == TSDB_DATA_TYPE_VARCHAR) {
varDataLen += CHAR_BYTES; varDataLen += CHAR_BYTES;
if (maxVarDataLen < CHAR_BYTES) { if (maxVarDataLen < CHAR_BYTES + sizeof(VarDataLenT)) {
maxVarDataLen = CHAR_BYTES; maxVarDataLen = CHAR_BYTES + sizeof(VarDataLenT);
} }
} else { } else {
varDataLen += INT_BYTES; varDataLen += INT_BYTES;
if (maxVarDataLen < INT_BYTES) { if (maxVarDataLen < INT_BYTES + sizeof(VarDataLenT)) {
maxVarDataLen = INT_BYTES; maxVarDataLen = INT_BYTES + sizeof(VarDataLenT);
} }
} }
} }
@ -1263,7 +1263,7 @@ int32_t tdSTSRowNew(SArray *pArray, STSchema *pTSchema, STSRow **ppRow) {
} }
if (maxVarDataLen > 0) { if (maxVarDataLen > 0) {
varBuf = taosMemoryMalloc(maxVarDataLen + sizeof(VarDataLenT)); varBuf = taosMemoryMalloc(maxVarDataLen);
if (!varBuf) { if (!varBuf) {
taosMemoryFreeClear(*ppRow); taosMemoryFreeClear(*ppRow);
terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;