From ec9c2bde696d8d9e965a5047c8b432bc0ad9bafa Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 20 Nov 2023 11:38:48 +0800 Subject: [PATCH 1/2] fix(cos/etags): initialize etags to NULL --- source/common/src/cos.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/common/src/cos.c b/source/common/src/cos.c index b4e654c67a..1dca5eda9b 100644 --- a/source/common/src/cos.c +++ b/source/common/src/cos.c @@ -537,7 +537,7 @@ int32_t s3PutObjectFromFile2(const char *file, const char *object) { S3MultipartCommitHandler commit_handler = { {&responsePropertiesCallbackNull, &responseCompleteCallback}, &multipartPutXmlCallback, 0}; - manager.etags = (char **)taosMemoryMalloc(sizeof(char *) * totalSeq); + manager.etags = (char **)taosMemoryCalloc(totalSeq, sizeof(char *)); manager.next_etags_pos = 0; /* if (uploadId) { @@ -597,6 +597,10 @@ int32_t s3PutObjectFromFile2(const char *file, const char *object) { char buf[256]; int n; for (i = 0; i < totalSeq; i++) { + if (!manager.etags[i]) { + code = TAOS_SYSTEM_ERROR(EIO); + goto clean; + } n = snprintf(buf, sizeof(buf), "%d" "%s", From d12bc412369467549565bec4819c1f9c355221a7 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 20 Nov 2023 14:30:25 +0800 Subject: [PATCH 2/2] tsdb/merge: clear file set before return 0 --- source/dnode/vnode/src/tsdb/tsdbMerge.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbMerge.c b/source/dnode/vnode/src/tsdb/tsdbMerge.c index ef6aba1324..7babaa6e28 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMerge.c +++ b/source/dnode/vnode/src/tsdb/tsdbMerge.c @@ -576,7 +576,10 @@ static int32_t tsdbMerge(void *arg) { } } - if (skipMerge) return 0; + if (skipMerge) { + code = 0; + goto _exit; + } // do merge tsdbDebug("vgId:%d merge begin, fid:%d", TD_VID(tsdb->pVnode), merger->fid);