h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-19 06:31:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix junk memory read introduced in 1cd5b2f4e1

Browse Source 
The commit began passing the length of the wide string rather than the
length of the narrowed string after conversion via `wcstombs`. We *do*
have the actual length, but it's not (necessarily) the same as the
original value. We need to pass the result of `wcstombs` instead.
This commit is contained in:
Mahmoud Al-Qudsi
2019-03-20 20:51:22 -05:00
parent a8b01e1c99
commit f2896b2d83
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output.cpp
View File

@@ -127,7 +127,7 @@ bool outputter_t::write_color(rgb_color_t color, bool is_fg) {
/// Since the terminfo string this function emits can potentially cause the screen to flicker, the
/// function takes care to write as little as possible.
///
/// Possible values for colors are rgb_color_t colors or special values like rgb_color_t::normal()
/// Possible values for colors are rgb_color_t colors or special values like rgb_color_t::normal()
///
/// In order to set the color to normal, three terminfo strings may have to be written.
///
@@ -411,8 +411,9 @@ void outputter_t::writestr(const wchar_t *str) {
} else {
buffer = new char[len];
}
wcstombs(buffer, str, len);
this->writestr(buffer, len);
int new_len = wcstombs(buffer, str, len);
this->writestr(buffer, new_len);
if (buffer != static_buffer) delete[] buffer;
}