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

Merge pull request #29780 from taosdata/fix/metanull_3.0 

fix(stream): access value after null ptr check.
This commit is contained in:
Shengliang Guan 2025-02-17 10:06:48 +08:00 committed by GitHub
parent c0aa91ff1e 0a101fc3c1
commit 0476a24646
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/vnode/src/tqCommon/tqCommon.c
View File

@ -1225,6 +1225,7 @@ int32_t tqStreamTaskProcessTaskResumeReq(void* handle, int64_t sversion, char* m
streamMetaReleaseTask(pMeta, pHTask); streamMetaReleaseTask(pMeta, pHTask);
} }
streamMetaReleaseTask(pMeta, pTask);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }

2
source/libs/stream/src/streamMeta.c
View File

@ -573,11 +573,11 @@ void streamMetaClear(SStreamMeta* pMeta) {
} }
void streamMetaClose(SStreamMeta* pMeta) { void streamMetaClose(SStreamMeta* pMeta) {
stDebug("vgId:%d start to close stream meta", pMeta->vgId);
if (pMeta == NULL) { if (pMeta == NULL) {
return; return;
} }
stDebug("vgId:%d start to close stream meta", pMeta->vgId);
int32_t code = taosRemoveRef(streamMetaRefPool, pMeta->rid); int32_t code = taosRemoveRef(streamMetaRefPool, pMeta->rid);
if (code) { if (code) {
stError("vgId:%d failed to remove meta ref:%" PRId64 ", code:%s", pMeta->vgId, pMeta->rid, tstrerror(code)); stError("vgId:%d failed to remove meta ref:%" PRId64 ", code:%s", pMeta->vgId, pMeta->rid, tstrerror(code));