thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add lost zero byte in regexpQuoteMeta

Browse Source
This commit is contained in:
Ivan Blinkov 2018-12-19 12:02:59 +03:00
parent c5cb1573b5
commit 714bd5b88a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Functions/regexpQuoteMeta.cpp
View File

@ -94,10 +94,12 @@ public:
/// suboptimal, but uses original implementation from re2
re2_st::StringPiece unquoted(source, srclen);
const auto & quoted = re2_st::RE2::QuoteMeta(unquoted);
std::memcpy(dst_pos, quoted.data(), quoted.size());
const auto size = quoted.size();
std::memcpy(dst_pos, quoted.data(), size);
source += srclen + 1;
dst_pos += quoted.size() + 1;
dst_pos[size] = '\0';
dst_pos += size + 1;
dst_offsets[row] = dst_pos - dst;
src_offset_prev = src_offsets[row];

2
dbms/src/Functions/trim.cpp
View File

@ -62,7 +62,7 @@ public:
res_data.resize(res_data.size() + length + 1);
std::memcpy(&res_data[res_offset], start, length);
res_offset += length + 1;
res_data[res_offset - 1] = 0;
res_data[res_offset - 1] = '\0';
res_offsets[i] = res_offset;
prev_offset = offsets[i];