fixed if condition crash when pos == -1

b3faef51 · Alex Duan · 96442834 · b3faef51
隐藏空白更改
内联并排

Showing with 7 addition and 4 deletion

src/tsdb/src/tsdbRead.c src/tsdb/src/tsdbRead.c +7 -4

未找到文件。
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -1641,10 +1641,13 @@ static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo*
        break;
      }
-      // above condition same with key in file
+      // break if pos not in this block endPos range. note old code when pos is -1 can crash.
-      if (((pos > endPos || keyFile[pos] > pQueryHandle->window.ekey) && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
+      if(ASCENDING_TRAVERSE(pQueryHandle->order)) { //ASC
-          ((pos < endPos || keyFile[pos] < pQueryHandle->window.ekey) && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
+        if(pos > endPos || keyFile[pos] > pQueryHandle->window.ekey)
-        break;
+          break;
+      } else { //DESC
+        if(pos < endPos || keyFile[pos] < pQueryHandle->window.ekey)
+          break;
      }
      // put keyMem row