Merge pull request #15143 from taosdata/fix/TS-1696-V26

fix: resolve a potential nullptr dereferencing on extraRow with update=2

Merge pull request #15143 from taosdata/fix/TS-1696-V26
fix: resolve a potential nullptr dereferencing on extraRow with update=2
eba176e9 · Minglei Jin · GitHub · d35da6c5 · abec9542 · eba176e9
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

src/tsdb/src/tsdbRead.c src/tsdb/src/tsdbRead.c +3 -1

未找到文件。
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -986,7 +986,9 @@ static SMemRow getSMemRowInTableMem(STableCheckInfo* pCheckInfo, int32_t order,
      return rmem;
    } else {
      pCheckInfo->chosen = CHECKINFO_CHOSEN_BOTH;
-      *extraRow = rimem;
+      if (extraRow) {
+        *extraRow = rimem;
+      }
      return rmem;
    }
  } else {