From 54ea1466fcdc7fa2517c73d042ec76ecf2b3192a Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 27 Sep 2024 15:24:19 +0800 Subject: [PATCH 1/2] fix: cpy mem overflow --- source/dnode/mnode/impl/src/mndStreamTrans.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndStreamTrans.c b/source/dnode/mnode/impl/src/mndStreamTrans.c index 7171d44da4..c08478b359 100644 --- a/source/dnode/mnode/impl/src/mndStreamTrans.c +++ b/source/dnode/mnode/impl/src/mndStreamTrans.c @@ -324,7 +324,9 @@ void killAllCheckpointTrans(SMnode *pMnode, SVgroupChangeInfo *pChangeInfo) { size_t len = 0; void *pKey = taosHashGetKey(pDb, &len); - tstrncpy(p, pKey, 128); + int cpLen = MIN(127, len); + TAOS_STRNCPY(p, pKey, cpLen); + p[cpLen] = '\0'; int32_t code = doKillCheckpointTrans(pMnode, pKey, len); if (code) { From 7198202611b0867a5ed7b1e4a88ec88b0920741f Mon Sep 17 00:00:00 2001 From: xsren <285808407@qq.com> Date: Fri, 27 Sep 2024 18:21:01 +0800 Subject: [PATCH 2/2] fix: build on windows --- source/dnode/mnode/impl/src/mndStreamTrans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndStreamTrans.c b/source/dnode/mnode/impl/src/mndStreamTrans.c index c08478b359..905a73ad48 100644 --- a/source/dnode/mnode/impl/src/mndStreamTrans.c +++ b/source/dnode/mnode/impl/src/mndStreamTrans.c @@ -324,7 +324,7 @@ void killAllCheckpointTrans(SMnode *pMnode, SVgroupChangeInfo *pChangeInfo) { size_t len = 0; void *pKey = taosHashGetKey(pDb, &len); - int cpLen = MIN(127, len); + int cpLen = (127 < len) ? 127 : len; TAOS_STRNCPY(p, pKey, cpLen); p[cpLen] = '\0';