Skip to content

Fix crash in unreachable/overloaded RDS #190

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
kyessenov merged 2 commits into from
Mar 20, 2017
Merged

Fix crash in unreachable/overloaded RDS #190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b18a96
Fix crash in unreachable/overloaded RDS
kyessenov Mar 20, 2017
8abbf6d
Merge branch 'master' into rds_crash
kyessenov Mar 20, 2017
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
22 changes: 14 additions & 8 deletions src/envoy/mixer/http_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,23 +156,29 @@ class Instance : public Http::StreamDecoderFilter,

// mixer control switch (off by default)
bool mixer_disabled() {
auto route = decoder_callbacks_->route()->routeEntry();
auto route = decoder_callbacks_->route();
if (route != nullptr) {
auto key = route->opaqueConfig().find(kJsonNameMixerSwitch);
if (key != route->opaqueConfig().end() && key->second == "on") {
return false;
auto entry = route->routeEntry();
if (entry != nullptr) {
auto key = entry->opaqueConfig().find(kJsonNameMixerSwitch);
if (key != entry->opaqueConfig().end() && key->second == "on") {
return false;
}
}
}
return true;
}

// attribute forward switch (on by default)
bool forward_disabled() {
auto route = decoder_callbacks_->route()->routeEntry();
auto route = decoder_callbacks_->route();
if (route != nullptr) {
auto key = route->opaqueConfig().find(kJsonNameForwardSwitch);
if (key != route->opaqueConfig().end() && key->second == "off") {
return true;
auto entry = route->routeEntry();
if (entry != nullptr) {
auto key = entry->opaqueConfig().find(kJsonNameForwardSwitch);
if (key != entry->opaqueConfig().end() && key->second == "off") {
return true;
}
}
}
return false;
Expand Down