diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-27 02:10:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 02:10:56 +0200 |
| commit | 612099e3771578fd3e78171f1ca1444f6c41cef3 (patch) | |
| tree | c4173d550b3148c1223f67de0a8836dc744e831a /platform/x11/power_x11.cpp | |
| parent | ea55b400d908c01345a974cae82d8a8720e9904d (diff) | |
| parent | 7a07895920196c00d1ee14187e4ccdb2a6f0d0b9 (diff) | |
Merge pull request #10591 from Rubonnek/possible-null-ptr-dereference
Added/Fixed null pointer checks
Diffstat (limited to 'platform/x11/power_x11.cpp')
| -rw-r--r-- | platform/x11/power_x11.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/platform/x11/power_x11.cpp b/platform/x11/power_x11.cpp index 8e69a2223f..72fa5cf380 100644 --- a/platform/x11/power_x11.cpp +++ b/platform/x11/power_x11.cpp @@ -58,6 +58,7 @@ Adapted from corresponding SDL 2.0 code. #include <stdio.h> #include <unistd.h> +#include "core/error_macros.h" #include <dirent.h> #include <fcntl.h> #include <sys/stat.h> @@ -254,9 +255,9 @@ bool PowerX11::GetPowerInfo_Linux_proc_acpi() { this->power_state = POWERSTATE_UNKNOWN; dirp->change_dir(proc_acpi_battery_path); - dirp->list_dir_begin(); + Error err = dirp->list_dir_begin(); - if (dirp == NULL) { + if (err != OK) { return false; /* can't use this interface. */ } else { node = dirp->get_next(); @@ -268,8 +269,8 @@ bool PowerX11::GetPowerInfo_Linux_proc_acpi() { } dirp->change_dir(proc_acpi_ac_adapter_path); - dirp->list_dir_begin(); - if (dirp == NULL) { + err = dirp->list_dir_begin(); + if (err != OK) { return false; /* can't use this interface. */ } else { node = dirp->get_next(); @@ -438,9 +439,9 @@ bool PowerX11::GetPowerInfo_Linux_sys_class_power_supply(/*PowerState *state, in DirAccess *dirp = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); dirp->change_dir(base); - dirp->list_dir_begin(); + Error err = dirp->list_dir_begin(); - if (!dirp) { + if (err != OK) { return false; } |