diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-14 16:44:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-14 16:44:20 +0000 |
| commit | 3c5ea31c4dcd8b8f5d34cb97caa91692e4ca680b (patch) | |
| tree | a265efa4db9302564d295195bcbd8d5592331ec2 | |
| parent | 97da1179c4b827d55299ebd9dfae3895524bf4fe (diff) | |
| parent | 937d045498100aa04075cd3192b413c8ad01be56 (diff) | |
| download | extras-3c5ea31c4dcd8b8f5d34cb97caa91692e4ca680b.tar.gz | |
Merge "simpleperf: null check FindEventTypeByName return value"android-r-beta-3android-r-beta-2
| -rw-r--r-- | simpleperf/profcollect.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/simpleperf/profcollect.cpp b/simpleperf/profcollect.cpp index 2f15c351..83997dd0 100644 --- a/simpleperf/profcollect.cpp +++ b/simpleperf/profcollect.cpp @@ -25,7 +25,10 @@ namespace simpleperf { namespace etm { bool HasSupport() { - const EventType* type = FindEventTypeByName("cs-etm"); + const EventType* type = FindEventTypeByName("cs-etm", false); + if (type == nullptr) { + return false; + } return IsEventAttrSupported(CreateDefaultPerfEventAttr(*type), type->name); } |