Skip to content

Commit

Permalink
Fix potential crash in search if an entry doesn't have a group (#9633)
Browse files Browse the repository at this point in the history
  • Loading branch information
droidmonkey authored Jul 19, 2023
1 parent bb37cf3 commit 534b61e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/core/EntrySearcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,10 @@ bool EntrySearcher::searchEntryImpl(const Entry* entry)
auto attributes = QStringList(attributes_keys + entry->attributes()->values(attributes_keys));
auto attachments = QStringList(entry->attachments()->keys());
// Build a group hierarchy to allow searching for e.g. /group1/subgroup*
auto hierarchy = entry->group()->hierarchy().join('/').prepend("/");
QString hierarchy;
if (entry->group()) {
hierarchy = entry->group()->hierarchy().join('/').prepend("/");
}

// By default, empty term matches every entry.
// However when skipping protected fields, we will reject everything instead
Expand Down Expand Up @@ -190,7 +193,7 @@ bool EntrySearcher::searchEntryImpl(const Entry* entry)
// Match against the full hierarchy if the word contains a '/' otherwise just the group name
if (term.word.contains('/')) {
found = term.regex.match(hierarchy).hasMatch();
} else {
} else if (entry->group()) {
found = term.regex.match(entry->group()->name()).hasMatch();
}
break;
Expand Down

0 comments on commit 534b61e

Please sign in to comment.