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.

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

src: add null check to GetCategoryGroupEnabled() #21545

Merged
merged 1 commit into from
Jun 28, 2018
Merged

src: add null check to GetCategoryGroupEnabled() #21545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
src: add null check to GetCategoryGroupEnabled() 
The input to this function shouldn't be null, and callers are
not equipped to deal with a nullptr return value. Change the
nullptr return to a CHECK_NOT_NULL(). Also fix the indentation
of the function.

PR-URL: #21545
Fixes: #19991
Reviewed-By: Wyatt Preul <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
  • Loading branch information
@cjihrig
cjihrig committed Jun 28, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 2a875c3c6ffd5e7023d22990a4ba8e90c4cc1307
5 changes: 2 additions & 3 deletions src/node_trace_events.cc
View file
Original file line number Diff line number Diff line change
@@ -95,9 +95,8 @@ static std::unordered_set<std::string> categoryGroups;
// Gets a pointer to the category-enabled flags for a tracing category group,
// if tracing is enabled for it.
static const uint8_t* GetCategoryGroupEnabled(const char* category_group) {
if (category_group == nullptr) return nullptr;

return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
CHECK_NOT_NULL(category_group);
return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
}

static const char* GetCategoryGroup(Environment* env,