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

liboxide: Catch stoi() exceptions #302

Merged
merged 3 commits into from
May 10, 2023
Merged

liboxide: Catch stoi() exceptions #302

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c83a26
liboxide: Catch stoi exceptions
alistair23 May 9, 2023
eb6f0d0
Merge branch 'master' into alistair/battery-crash-fix
Eeems May 10, 2023
9e980fd
Update debug output
Eeems May 10, 2023
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
8 changes: 7 additions & 1 deletion shared/liboxide/sysobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ namespace Oxide{
return dir.exists();
}
int SysObject::intProperty(const std::string& name){
return std::stoi(strProperty(name));
try {
return std::stoi(strProperty(name));
}
catch (const std::invalid_argument& e) {
O_DEBUG("Property value is not an integer: " << name.c_str());
return 0;
}
}
std::string SysObject::strProperty(const std::string& name){
auto path = propertyPath(name);
Expand Down