github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-21 05:52:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Color lookup: Use wcsncmp to avoid looking at garbage

Browse Source 
The `reserve` here can, under certain circumstances, reserve more than
strictly needed.

The simple workaround is to just never look at more than we feed in.

(really what we'd *want* is to look at the length of the *color
names*, but those are wchar, so length lookup is crappy NULL-lookup)
This commit is contained in:
Fabian Homborg 2020-06-20 22:10:12 +02:00
parent 63f7f1925e
commit 40de4ef764
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/color.cpp
View File

@ -212,6 +212,7 @@ bool rgb_color_t::try_parse_named(const wcstring &str) {
// Binary search
named_color_t search;
search.name = str.c_str();
auto len = str.length();
// Optimized conversion to lowercase with early abort
wcstring lowercase;
@ -231,7 +232,8 @@ bool rgb_color_t::try_parse_named(const wcstring &str) {
auto result = std::lower_bound(named_colors_begin, named_colors_end, search,
[&](const named_color_t &c1, const named_color_t &c2) {
return wcscmp(c1.name, c2.name) < 0; });
return wcsncmp(c1.name, c2.name, len) < 0;
});
if (result != named_colors_end && !(wcscmp(search.name, result->name) < 0)) {
data.name_idx = result->idx;