Skip to content
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.

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

check for errors return status from extension table. #6108

Merged
merged 3 commits into from
Feb 28, 2020

Conversation

Agile86
Copy link
Contributor

@Agile86 Agile86 commented Dec 9, 2019

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Dec 9, 2019

CLA Check
The committers are authorized under a signed CLA.

@theopolis
Copy link
Member

Thanks for the PR @Agile86! This needs a minor formatting update and the CLA needs to be signed and we can merge.

Do you mind applying the change here?

diff --git a/osquery/sql/virtual_table.cpp b/osquery/sql/virtual_table.cpp
index 7314ad3f..9535c1c8 100644
--- a/osquery/sql/virtual_table.cpp
+++ b/osquery/sql/virtual_table.cpp
@@ -1003,8 +1003,7 @@ static int xFilter(sqlite3_vtab_cursor* pVtabCursor,
     PluginRequest request = {{"action", "generate"}};
     TablePlugin::setRequestFromContext(context, request);
     QueryData qd;
-    auto status =
-        Registry::call("table", pVtab->content->name, request, qd);
+    auto status = Registry::call("table", pVtab->content->name, request, qd);
     if (!status.ok()) {
       VLOG(1) << "Invalid response from the extension table. Error "
               << status.getCode() << ": " << status.getMessage();

@theopolis theopolis added the extensions Related to osquery extension SDK or to extensions themselves label Dec 10, 2019
@theopolis theopolis merged commit d3a10a3 into osquery:master Feb 28, 2020
@Agile86 Agile86 deleted the registry_call_check branch March 22, 2020 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
extensions Related to osquery extension SDK or to extensions themselves needs response
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants