TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-13 03:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve blacklist to require precise app name matches (#1532)

Browse Source 
* Add files via upload

* Add files via upload

* Add files via upload

* Clang

* Update ui_btngrid.cpp

* Update comment
This commit is contained in:
Mark Thompson 2023-10-28 14:32:59 -05:00 committed by GitHub
parent cc7e4aec8a
commit 0bacb31d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
firmware/application/ui/ui_btngrid.cpp
View File

@ -246,13 +246,24 @@ void load_blacklist() {
if (error)
return;
blacklist_ptr = std::unique_ptr<char>(new char[f.size()]);
if (f.read(blacklist_ptr.get(), f.size()))
blacklist_len = f.size();
// allocating two extra bytes for leading & trailing commas
blacklist_ptr = std::unique_ptr<char>(new char[f.size() + 2]);
if (f.read(blacklist_ptr.get() + 1, f.size())) {
blacklist_len = f.size() + 2;
// replace any CR/LF characters with comma delineator, and add comma prefix/suffix, to simplify searching
char* ptr = blacklist_ptr.get();
*ptr = ',';
*(ptr + blacklist_len - 1) = ',';
for (size_t i = 0; i < blacklist_len; i++, ptr++) {
if (*ptr == 0x0D || *ptr == 0x0A)
*ptr = ',';
}
}
}
bool BtnGridView::blacklisted_app(GridItem new_item) {
std::string app_name = new_item.text;
std::string app_name = "," + new_item.text + ",";
if (blacklist_len < app_name.size())
return false;