Przeglądaj źródła

Merge pull request #5880 from ghalliday/issue11430

HPCC-11430 Prevent stack fault when parameter not substituted

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 lat temu
rodzic
commit
27e7d97ffd
2 zmienionych plików z 3 dodań i 0 usunięć
  1. 1 0
      ecl/hql/hqlmeta.cpp
  2. 2 0
      ecl/hqlcpp/hqlhtcpp.cpp

+ 1 - 0
ecl/hql/hqlmeta.cpp

@@ -2826,6 +2826,7 @@ void calculateDatasetMeta(CHqlMetaInfo & meta, IHqlExpression * expr)
             meta.setUnknownGrouping();
         break;
     case no_externalcall:
+    case no_external:
         if (isGrouped(expr))
             meta.setUnknownGrouping();
         //No support for grouping?

+ 2 - 0
ecl/hqlcpp/hqlhtcpp.cpp

@@ -6549,6 +6549,8 @@ ABoundActivity * HqlCppTranslator::buildActivity(BuildCtx & ctx, IHqlExpression
             case no_executewhen:
                 result = doBuildActivityExecuteWhen(ctx, expr, isRoot);
                 break;
+            case no_param:
+                throwUnexpectedX("Create Parameter as an activity");
             case no_thor:
                 UNIMPLEMENTED;
                 break;