fix core dump caused by SQueryAttr pExpr2 execute at client side

a7d42263 · shenglian zhou · 1728666e · a7d42263
显示空白变更内容
内联并排

Showing with 7 addition and 1 deletion

src/query/src/qExecutor.c src/query/src/qExecutor.c +7 -1

未找到文件。
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -2376,7 +2376,13 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
      }

      case OP_Order: {
-        pRuntimeEnv->proot = createOrderOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1, pQueryAttr->numOfOutput, &pQueryAttr->order);
+        if (pQueryAttr->pExpr2 != NULL) {
+          pRuntimeEnv->proot = createOrderOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr2,
+                                                       pQueryAttr->numOfExpr2, &pQueryAttr->order);
+        } else {
+          pRuntimeEnv->proot = createOrderOperatorInfo(pRuntimeEnv, pRuntimeEnv->proot, pQueryAttr->pExpr1,
+                                                       pQueryAttr->numOfOutput, &pQueryAttr->order);
+        }
        break;
      }