anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

filter: Check for empty results when filtering 

The user could search for a term that isn't stored in the filter index.
This is represented through a NULL pointer returned from the
Index.find() function.  Let's check this pointer before attempting to
dereference it ...

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-08-12 09:59:00 -04:00
parent b9c3d9684c
commit be72339b2d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/filter.cpp
View File

@ -90,14 +90,21 @@ std::string filter :: add(const std::string &text, unsigned int track_id)
return reassemble_text(parsed);
}
static void do_set_intersection(std::set<unsigned int> &a,
std::set<unsigned int> &b,
std::set<unsigned int> &res)
{
set_intersection(a.begin(), a.end(), b.begin(), b.end(),
std::inserter<std::set<unsigned int> >(res, res.begin()));
}
static void find_intersection(std::string &text, std::set<unsigned int> &res)
{
IndexEntry *it = filter_index.find(text);
std::set<unsigned int> tmp;
IndexEntry *it = filter_index.find(text);
set_intersection(it->values.begin(), it->values.end(),
res.begin(), res.end(),
std::inserter<std::set<unsigned int> >(tmp, tmp.begin()));
if (it)
do_set_intersection(res, it->values, tmp);
res.swap(tmp);
}

3
tests/core/filter.cpp
View File

@ -96,6 +96,9 @@ static void test_search()
unsigned int res5[] = {};
do_test_search("unknown terms", 0, res5);
unsigned int res6[] = {};
do_test_search("the chestZ", 0, res6);
}
int main(int argc, char **argv)