commit 6f4e6ae53267486bc06dd48bd3083ea72ec4f321
author Maciej Żenczykowski <maze@google.com> Wed Jul 13 20:51:17 2022 +0000
committer Maciej Żenczykowski <maze@google.com> Wed Jul 13 20:51:21 2022 +0000
tree 31042c5cb0c055edc6e42c0311893fe4306d3f58
parent 8693c789d3ba1b6787bc9c00d105b808a50d375c

fix a potential invalid dereference

Change-Id: I3dc9a8b868953ad3c9eb1ddfd1f76c3be94af8a6

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 859d1c5..ab9b45f 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.25
+// This is BpfLoader v0.26
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 25u
+#define BPFLOADER_VERSION_MINOR 26u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -1078,7 +1078,7 @@
                 for (const auto& line : lines) ALOGW("%s", line.c_str());
                 ALOGW("bpf_prog_load - END log_buf contents.");
 
-                if (cs[i].prog_def->optional) {
+                if (cs[i].prog_def.has_value() && cs[i].prog_def->optional) {
                     ALOGW("failed program is marked optional - continuing...");
                     continue;
                 }