diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c index 88b13310d8..cfaf155276 100644 --- a/source/dnode/vnode/src/vnd/vnodeCommit.c +++ b/source/dnode/vnode/src/vnd/vnodeCommit.c @@ -256,7 +256,9 @@ int vnodeLoadInfo(const char *dir, SVnodeInfo *pInfo) { _exit: if (code) { - vError("vgId:%d %s failed at %s:%d since %s", pInfo->config.vgId, __func__, __FILE__, lino, tstrerror(code)); + if (pFile) { + vError("vgId:%d %s failed at %s:%d since %s", pInfo->config.vgId, __func__, __FILE__, lino, tstrerror(code)); + } } taosMemoryFree(pData); (void)taosCloseFile(&pFile); diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c index 5dca0ebb73..5f4bbd66ce 100644 --- a/source/libs/executor/src/sysscanoperator.c +++ b/source/libs/executor/src/sysscanoperator.c @@ -2369,11 +2369,12 @@ static FORCE_INLINE int optSysBinarySearch(SArray* arr, int s, int e, uint64_t k int32_t optSysIntersection(SArray* in, SArray* out) { int32_t code = TSDB_CODE_SUCCESS; int32_t lino = 0; + MergeIndex* mi = NULL; int32_t sz = (int32_t)taosArrayGetSize(in); if (sz <= 0) { goto _end; } - MergeIndex* mi = taosMemoryCalloc(sz, sizeof(MergeIndex)); + mi = taosMemoryCalloc(sz, sizeof(MergeIndex)); QUERY_CHECK_NULL(mi, code, lino, _end, terrno); for (int i = 0; i < sz; i++) { SArray* t = taosArrayGetP(in, i);