summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-08-03 18:51:31 +0200
committerGitHub <noreply@github.com>2023-08-03 18:51:31 +0200
commitb48321b58fadcabf47ee87535d3ecf526873c4e0 (patch)
tree0a270524d7b7908b9aae2ffb317de0783b0d7810
parentc93bda744b37b3c5b2047b89d58fbc41cb1b6456 (diff)
parent7c29d369c5fc899c97b17725a34781f6a23090b0 (diff)
Merge pull request #27964 from vespa-engine/balder/avoid-copying-0-bytes-from-nullptr
Avoid copying 0 bytes from a nullptr
-rw-r--r--searchlib/src/vespa/searchlib/expression/resultnodes.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp
index 7fb3ab1b6cf..8f9f1b7ca06 100644
--- a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp
+++ b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp
@@ -438,7 +438,9 @@ void
RawResultNode::setBuffer(const void *buf, size_t sz)
{
_value.resize(sz + 1);
- memcpy(_value.data(), buf, sz);
+ if (sz > 0) {
+ memcpy(_value.data(), buf, sz);
+ }
_value.back() = 0;
_value.resize(sz);
}