Skip to content

[release-1.6] Update cel-cpp to fix CEL seg fault #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 2 commits into from
May 18, 2020
Merged

[release-1.6] Update cel-cpp to fix CEL seg fault #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f8da11
Upgrade to cel-cpp v0.2.0 to pick up ANTLR thread-safety changes. (#514)
TristonianJones May 12, 2020
7d16e32
emit error if an error value is returned (#511)
mandarjog May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://storage.googleapis.com/quiche-envoy-integration/googleurl_dbf5ad147f60afc125e99db7549402af49a5eae8.tar.gz"],
),
com_google_cel_cpp = dict(
sha256 = "7eddffdb231e7c82f60c597cd38e742fbc0c48f54ca33015ac0a3d22bd51bba3",
strip_prefix = "cel-cpp-d88a4822af1864b481b31b12c2ecc4e631a7f8a9",
# 2019-04-13
urls = ["https://github.com/google/cel-cpp/archive/d88a4822af1864b481b31b12c2ecc4e631a7f8a9.tar.gz"],
sha256 = "d773ee368053f404eada87b59c9e545b2e21118ebb0577ac3e942a06518f6fd2",
strip_prefix = "cel-cpp-0.2.0",
# 2020-05-11
urls = ["https://github.com/google/cel-cpp/archive/v0.2.0.tar.gz"],
),
com_github_google_flatbuffers = dict(
sha256 = "b8efbc25721e76780752bad775a97c3f77a0250271e2db37fc747b20e8b0f24a",
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/common/wasm/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class Context : public Logger::Loggable<Logger::Id::wasm>,
static const std::vector<google::api::expr::runtime::CelAttributePattern> empty;
return empty;
}
const Protobuf::FieldMask unknown_paths() const override {
const Protobuf::FieldMask& unknown_paths() const override {
return Protobuf::FieldMask::default_instance();
}

Expand Down
7 changes: 6 additions & 1 deletion source/extensions/common/wasm/foreign.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,13 @@ class EvaluateExpressionFactory : public ExpressionFactory, public ForeignFuncti
ENVOY_LOG(debug, "expr_evaluate error: {}", eval_status.status().message());
return WasmResult::InternalFailure;
}
auto value = eval_status.value();
if (value.IsError()) {
ENVOY_LOG(debug, "expr_evaluate value error: {}", value.ErrorOrDie()->message());
return WasmResult::InternalFailure;
}
std::string result;
auto serialize_status = serializeValue(eval_status.value(), &result);
auto serialize_status = serializeValue(value, &result);
if (serialize_status != WasmResult::Ok) {
return serialize_status;
}
Expand Down