From bbaaad6f1f65666beb6a0a70d99b4b48b719b43a Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 8 Jan 2024 18:45:36 +0800 Subject: [PATCH] fix(stream): add null ptr check. --- source/libs/stream/src/streamStart.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/libs/stream/src/streamStart.c b/source/libs/stream/src/streamStart.c index 0c2993e296..52c3c87431 100644 --- a/source/libs/stream/src/streamStart.c +++ b/source/libs/stream/src/streamStart.c @@ -154,8 +154,7 @@ int32_t streamTaskStartScanHistory(SStreamTask* pTask) { int32_t level = pTask->info.taskLevel; ETaskStatus status = streamTaskGetStatus(pTask)->state; - ASSERT(pTask->status.downstreamReady == 1 && - ((status == TASK_STATUS__SCAN_HISTORY)/* || (status == TASK_STATUS__STREAM_SCAN_HISTORY)*/)); + ASSERT((pTask->status.downstreamReady == 1) && (status == TASK_STATUS__SCAN_HISTORY)); if (level == TASK_LEVEL__SOURCE) { return doStartScanHistoryTask(pTask); @@ -546,7 +545,11 @@ int32_t streamSetParamForScanHistory(SStreamTask* pTask) { int32_t streamResetParamForScanHistory(SStreamTask* pTask) { stDebug("s-task:%s reset operator option for scan-history data", pTask->id.idStr); - return qResetStreamOperatorOptionForScanHistory(pTask->exec.pExecutor); + if (pTask->exec.pExecutor != NULL) { + return qResetStreamOperatorOptionForScanHistory(pTask->exec.pExecutor); + } else { + return TSDB_CODE_SUCCESS; + } } int32_t streamRestoreParam(SStreamTask* pTask) {