github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

re: Use the variable-width pcre2 type

Browse Source 
This was what we always did in string. It makes it match the
annoyingly variable width of wchar_t.

Fixes #9502
This commit is contained in:
Fabian Boehm 2023-01-21 10:48:02 +01:00
parent 9b4c4ee7b6
commit 52d2087dd3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/re.cpp
View File

@ -251,7 +251,8 @@ maybe_t<wcstring> regex_t::substitute(const wcstring &subject, const wcstring &r
error_code_t rc = error_code_t rc =
pcre2_substitute(get_code(code_), to_sptr(subject), subject.size(), start_idx, options, pcre2_substitute(get_code(code_), to_sptr(subject), subject.size(), start_idx, options,
nullptr /* match_data */, nullptr /* context */, to_sptr(replacement), nullptr /* match_data */, nullptr /* context */, to_sptr(replacement),
replacement.size(), reinterpret_cast<PCRE2_UCHAR32 *>(buffer), &bufflen); // (not using UCHAR32 here for cygwin's benefit)
replacement.size(), reinterpret_cast<PCRE2_UCHAR *>(buffer), &bufflen);
if (out_repl_count) { if (out_repl_count) {
*out_repl_count = std::max(rc, 0); *out_repl_count = std::max(rc, 0);