From adb569817b24f01b86e0bcc4202ca8e664c11cdb Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 3 Jul 2021 00:09:18 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 3197 fix taosdemo coverity scan (#6726)

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

fix subscribeTest pids uninitialized.

* [TD-3197] <fix>: fix taosdemo coverity scan issues.

* [TD-3197] <fix>: fix coverity scan issues.

check super tbl info pointer.

* [TD-3197] <fix>: fix coverity scan issues.

move sub tbl query thread join into loop

* [TD-3197] <fix>: fix coverity scan issues.

remove unused variable

* [TD-3197] <fix>: fix coverity scan issues.

use more secure random library

* [TD-3197] <fix>: fix coverity scan issues.

use strncpy for more safe

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

replace arc4random with rand().

* [TD-3197] <fix>: fix coverity scan issues.

check stb info pointer for start time

* [TD-3197] <fix>: fix coverity scan issues.

fix strcpy vulnerability

* [TD-3197] <fix>: fix taosdemo coverity scan issue.

modify taosdemoTest2. try to check database continously.

* [TD-3197] <fix>: taosdemo coverity scan issues.

* [TD-3197] <fix>: fix memory leak when parsing arguments.

* [TD-3197] <fix>: fix cmake strip arguments.

* [TD-3197] <fix>: taosdemo coverity scan.

fix cmake string manipulation.

* [TD-3197]<fix>: taosdemo coverity scan issue.

configDir buffer overwrite.

* [TD-3197]<fix>: coverity scan issue.

taosdump argument validation.

* [TD-3197]<fix>: taosdemo and taosdump coverity scan issues.

* [TD-3197]<fix>: taosdemo coverity scan.

append result buf to file. for develop branch.

* exit if read sample file failed.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 src/kit/taosdemo/taosdemo.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 21c3f28c90..8f505c53eb 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -4706,14 +4706,18 @@ PARSE_OVER:
   return ret;
 }
 
-static void prepareSampleData() {
+static int prepareSampleData() {
   for (int i = 0; i < g_Dbs.dbCount; i++) {
     for (int j = 0; j < g_Dbs.db[i].superTblCount; j++) {
       if (g_Dbs.db[i].superTbls[j].tagsFile[0] != 0) {
-        (void)readTagFromCsvFileToMem(&g_Dbs.db[i].superTbls[j]);
+        if (readTagFromCsvFileToMem(&g_Dbs.db[i].superTbls[j]) != 0) {
+          return -1;
+        }
       }
     }
   }
+
+  return 0;
 }
 
 static void postFreeResource() {
@@ -6777,7 +6781,11 @@ static int insertTestProcess() {
   }
 
   // pretreatement
-  prepareSampleData();
+  if (prepareSampleData() != 0) {
+    if (g_fpOfInsertResult)
+      fclose(g_fpOfInsertResult);
+    return -1;
+  }
 
   double start;
   double end;
-- 
GitLab