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

check null ptr

This commit is contained in:
Liu Jicong 2022-12-08 11:47:52 +08:00
parent 8cef033f92
commit 2c13c8b357
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/dnode/vnode/src/tq/tqRead.c
View File

@ -695,13 +695,16 @@ int32_t tqRetrieveDataBlock2(SSDataBlock* pBlock, STqReader* pReader) {
} }
#endif #endif
if (IS_STR_DATA_TYPE(colVal.type)) { if (IS_STR_DATA_TYPE(colVal.type)) {
char val[65535 + 2]; if (colVal.value.pData != NULL) {
memcpy(varDataVal(val), colVal.value.pData, colVal.value.nData); char val[65535 + 2];
varDataSetLen(val, colVal.value.nData); memcpy(varDataVal(val), colVal.value.pData, colVal.value.nData);
if (colDataAppend(pColData, i, val, !COL_VAL_IS_VALUE(&colVal)) < 0) { varDataSetLen(val, colVal.value.nData);
goto FAIL; if (colDataAppend(pColData, i, val, !COL_VAL_IS_VALUE(&colVal)) < 0) {
goto FAIL;
}
} else {
colDataAppendNULL(pColData, i);
} }
/*val = colVal.value.pData;*/
} else { } else {
if (colDataAppend(pColData, i, (void*)&colVal.value.val, !COL_VAL_IS_VALUE(&colVal)) < 0) { if (colDataAppend(pColData, i, (void*)&colVal.value.val, !COL_VAL_IS_VALUE(&colVal)) < 0) {
goto FAIL; goto FAIL;
@ -734,11 +737,15 @@ int32_t tqRetrieveDataBlock2(SSDataBlock* pBlock, STqReader* pReader) {
continue; continue;
} else if (colVal.cid == pColData->info.colId) { } else if (colVal.cid == pColData->info.colId) {
if (IS_STR_DATA_TYPE(colVal.type)) { if (IS_STR_DATA_TYPE(colVal.type)) {
char val[65535 + 2]; if (colVal.value.pData != NULL) {
memcpy(varDataVal(val), colVal.value.pData, colVal.value.nData); char val[65535 + 2];
varDataSetLen(val, colVal.value.nData); memcpy(varDataVal(val), colVal.value.pData, colVal.value.nData);
if (colDataAppend(pColData, i, val, !COL_VAL_IS_VALUE(&colVal)) < 0) { varDataSetLen(val, colVal.value.nData);
goto FAIL; if (colDataAppend(pColData, i, val, !COL_VAL_IS_VALUE(&colVal)) < 0) {
goto FAIL;
}
} else {
colDataAppendNULL(pColData, i);
} }
/*val = colVal.value.pData;*/ /*val = colVal.value.pData;*/
} else { } else {

2
source/dnode/vnode/src/tq/tqSink.c
View File

@ -762,7 +762,6 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
tqDebug("vgId:%d, task %d write into table, block num: %d", TD_VID(pVnode), pTask->taskId, blockSz); tqDebug("vgId:%d, task %d write into table, block num: %d", TD_VID(pVnode), pTask->taskId, blockSz);
void* pBuf = NULL; void* pBuf = NULL;
int32_t len = 0;
SSubmitReq2* pReq = NULL; SSubmitReq2* pReq = NULL;
SArray* tagArray = NULL; SArray* tagArray = NULL;
SArray* pVals = NULL; SArray* pVals = NULL;
@ -931,6 +930,7 @@ void tqSinkToTablePipeline2(SStreamTask* pTask, void* vnode, int64_t ver, void*
taosMemoryFree(pTbData); taosMemoryFree(pTbData);
// encode // encode
int32_t len;
int32_t code; int32_t code;
tEncodeSize(tEncodeSSubmitReq2, pReq, len, code); tEncodeSize(tEncodeSSubmitReq2, pReq, len, code);
SEncoder encoder; SEncoder encoder;