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

Make escape() return a wcstring

Browse Source 
This avoids the potential for leaking the resulting string.
This commit is contained in:
Kevin Ballard
2014-09-25 18:20:03 -07:00
parent cd4fa518b8
commit 35595dbffd
7 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
output.cpp
View File

@@ -567,15 +567,13 @@ void writestr_ellipsis(const wchar_t *str, int max_width)
int write_escaped_str(const wchar_t *str, int max_len)
{
wchar_t *out;
int i;
int len;
int written=0;
CHECK(str, 0);
out = escape(str, 1);
len = fish_wcswidth(out);
wcstring out = escape(str, ESCAPE_ALL);
int len = fish_wcswidth(out);
if (max_len && (max_len < len))
{
@@ -596,10 +594,9 @@ int write_escaped_str(const wchar_t *str, int max_len)
else
{
written = len;
writestr(out);
writestr(out.c_str());
}
free(out);
return written;
}