From 93b9371ee8cd3843226aa4e9c31bdc722faac691 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 2 Jul 2021 18:33:42 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 4918 taosdemo sub afterconsume (#6723)

* [TD-4918]<fix>: taosdemo subscribe endAfterResume.

* fix mask length.

* fix heap use-after-free.

* fix illegal input value of consume.
---
 src/kit/taosdemo/taosdemo.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 5baa1f4560..7f8818df7e 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -4394,20 +4394,21 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
         tstrncpy(g_queryInfo.specifiedQueryInfo.sql[j],
                 sqlStr->valuestring, MAX_QUERY_SQL_LENGTH);
 
+        // default value is -1, which mean infinite loop
+        g_queryInfo.specifiedQueryInfo.endAfterConsume[j] = -1;
         cJSON* endAfterConsume =
             cJSON_GetObjectItem(specifiedQuery, "endAfterConsume");
         if (endAfterConsume
                 && endAfterConsume->type == cJSON_Number) {
             g_queryInfo.specifiedQueryInfo.endAfterConsume[j]
                 = endAfterConsume->valueint;
-        } else if (!endAfterConsume) {
-            // default value is -1, which mean infinite loop
-            g_queryInfo.specifiedQueryInfo.endAfterConsume[j] = -1;
         }
+        if (g_queryInfo.specifiedQueryInfo.endAfterConsume[j] < -1)
+            g_queryInfo.specifiedQueryInfo.endAfterConsume[j] = -1;
 
+        g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] = -1;
         cJSON* resubAfterConsume =
             cJSON_GetObjectItem(specifiedQuery, "resubAfterConsume");
-        g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] = -1;
         if ((resubAfterConsume)
                 && (resubAfterConsume->type == cJSON_Number)
                 && (resubAfterConsume->valueint >= 0)) {
@@ -4415,6 +4416,9 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
                 = resubAfterConsume->valueint;
         }
 
+        if (g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] < -1)
+            g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] = -1;
+
         cJSON *result = cJSON_GetObjectItem(sql, "result");
         if ((NULL != result) && (result->type == cJSON_String)
                 && (result->valuestring != NULL)) {
@@ -4556,26 +4560,30 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
       g_queryInfo.superQueryInfo.subscribeKeepProgress = 0;
     }
 
+    // default value is -1, which mean do not resub
+    g_queryInfo.superQueryInfo.endAfterConsume = -1;
     cJSON* superEndAfterConsume =
             cJSON_GetObjectItem(superQuery, "endAfterConsume");
     if (superEndAfterConsume
             && superEndAfterConsume->type == cJSON_Number) {
         g_queryInfo.superQueryInfo.endAfterConsume =
             superEndAfterConsume->valueint;
-    } else if (!superEndAfterConsume) {
-        // default value is -1, which mean do not resub
-        g_queryInfo.superQueryInfo.endAfterConsume = -1;
     }
+    if (g_queryInfo.superQueryInfo.endAfterConsume < -1)
+        g_queryInfo.superQueryInfo.endAfterConsume = -1;
 
+    // default value is -1, which mean do not resub
+    g_queryInfo.superQueryInfo.resubAfterConsume = -1;
     cJSON* superResubAfterConsume =
             cJSON_GetObjectItem(superQuery, "resubAfterConsume");
-    g_queryInfo.superQueryInfo.resubAfterConsume = -1;
     if ((superResubAfterConsume)
             && (superResubAfterConsume->type == cJSON_Number)
             && (superResubAfterConsume->valueint >= 0)) {
         g_queryInfo.superQueryInfo.resubAfterConsume =
             superResubAfterConsume->valueint;
     }
+    if (g_queryInfo.superQueryInfo.resubAfterConsume < -1)
+        g_queryInfo.superQueryInfo.resubAfterConsume = -1;
 
     // supert table sqls
     cJSON* superSqls = cJSON_GetObjectItem(superQuery, "sqls");