github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-29 21:43:55 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove unnecessary string duplication in handle_flag_f.

Browse Source 
Prevents a memory leak.
This commit is contained in:
Lior Stern 2020-04-06 17:53:33 +03:00 committed by Fabian Homborg
parent 39e0fd14eb
commit ca91c201c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/builtin_string.cpp
View File

@ -274,7 +274,7 @@ static int handle_flag_f(wchar_t **argv, parser_t &parser, io_streams_t &streams
for (const wcstring &s : split_string(w.woptarg, L',')) { for (const wcstring &s : split_string(w.woptarg, L',')) {
wcstring_list_t range = split_string(s, L'-'); wcstring_list_t range = split_string(s, L'-');
if (range.size() == 2) { if (range.size() == 2) {
int begin = fish_wcstoi(wcsdup(range.at(0).c_str())); int begin = fish_wcstoi(range.at(0).c_str());
if (begin <= 0 || begin == INT_MIN || errno == ERANGE) { if (begin <= 0 || begin == INT_MIN || errno == ERANGE) {
string_error(streams, _(L"%ls: Invalid range value for field '%ls'\n"), argv[0], string_error(streams, _(L"%ls: Invalid range value for field '%ls'\n"), argv[0],
w.woptarg); w.woptarg);
@ -283,7 +283,7 @@ static int handle_flag_f(wchar_t **argv, parser_t &parser, io_streams_t &streams
string_error(streams, BUILTIN_ERR_NOT_NUMBER, argv[0], w.woptarg); string_error(streams, BUILTIN_ERR_NOT_NUMBER, argv[0], w.woptarg);
return STATUS_INVALID_ARGS; return STATUS_INVALID_ARGS;
} }
int end = fish_wcstoi(wcsdup(range.at(1).c_str())); int end = fish_wcstoi(range.at(1).c_str());
if (end <= 0 || end == INT_MIN || errno == ERANGE) { if (end <= 0 || end == INT_MIN || errno == ERANGE) {
string_error(streams, _(L"%ls: Invalid range value for field '%ls'\n"), argv[0], string_error(streams, _(L"%ls: Invalid range value for field '%ls'\n"), argv[0],
w.woptarg); w.woptarg);
@ -302,7 +302,7 @@ static int handle_flag_f(wchar_t **argv, parser_t &parser, io_streams_t &streams
} }
} }
} else { } else {
int field = fish_wcstoi(wcsdup(s.c_str())); int field = fish_wcstoi(s.c_str());
if (field <= 0 || field == INT_MIN || errno == ERANGE) { if (field <= 0 || field == INT_MIN || errno == ERANGE) {
string_error(streams, _(L"%ls: Invalid fields value '%ls'\n"), argv[0], string_error(streams, _(L"%ls: Invalid fields value '%ls'\n"), argv[0],
w.woptarg); w.woptarg);