From 3ca5559b379930ceb07ca113076a287c8261b9e2 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 12 May 2023 19:27:11 +0800 Subject: [PATCH] fix: invalid read issue --- source/dnode/vnode/src/tsdb/tsdbRead.c | 2 +- source/util/src/tcompression.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 88d0981c6b..21b59e376c 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -2791,7 +2791,7 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) { STableBlockScanInfo* pBlockScanInfo = NULL; if (pBlockInfo != NULL) { - if (pReader->pIgnoreTables && taosHashGet(*pReader->pIgnoreTables, &pBlockScanInfo->uid, sizeof(pBlockScanInfo->uid))) { + if (pReader->pIgnoreTables && taosHashGet(*pReader->pIgnoreTables, &pBlockInfo->uid, sizeof(pBlockInfo->uid))) { setBlockAllDumped(pDumpInfo, pBlock->maxKey.ts, pReader->order); return code; } diff --git a/source/util/src/tcompression.c b/source/util/src/tcompression.c index 58528a91ba..38d5a9edeb 100644 --- a/source/util/src/tcompression.c +++ b/source/util/src/tcompression.c @@ -916,7 +916,7 @@ FORCE_INLINE uint64_t decodeDoubleValue(const char *const input, int32_t *const uint64_t diff = 0ul; int32_t nbytes = (flag & 0x7) + 1; for (int32_t i = 0; i < nbytes; i++) { - diff |= ((0xffff & input[(*ipos)++]) << BITS_PER_BYTE * i); + diff |= (((uint64_t)0xffff & input[(*ipos)++]) << BITS_PER_BYTE * i); } int32_t shift_width = (LONG_BYTES * BITS_PER_BYTE - nbytes * BITS_PER_BYTE) * (flag >> 3); diff <<= shift_width;