From 8fc3f6ff97b20086e0ba11a4011416159547562c Mon Sep 17 00:00:00 2001 From: msm-code Date: Fri, 15 May 2020 20:40:41 +0200 Subject: [PATCH] Test code with UB sanitiser, remove unwanted null (#149) --- libursa/OnDiskIndex.cpp | 2 +- libursa/ZHelpers.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libursa/OnDiskIndex.cpp b/libursa/OnDiskIndex.cpp index 35044f3..d595aae 100644 --- a/libursa/OnDiskIndex.cpp +++ b/libursa/OnDiskIndex.cpp @@ -138,7 +138,7 @@ void OnDiskIndex::on_disk_merge_core( // Arbitrary number describing how much RAM we want to spend on the run // cache during the batched stream pass. - constexpr uint64_t MAX_BATCH_BYTES = 2ULL * 1024ULL * 1024ULL * 1024ULL; + constexpr uint64_t MAX_BATCH_BYTES = 1024ULL * 1024ULL * 1024ULL; // Vector used for all merge passes (to avoid unnecessary reallocations). std::vector batch_vector(MAX_BATCH_BYTES); diff --git a/libursa/ZHelpers.cpp b/libursa/ZHelpers.cpp index 7f7f731..23cd1c7 100644 --- a/libursa/ZHelpers.cpp +++ b/libursa/ZHelpers.cpp @@ -3,7 +3,9 @@ bool s_send_raw(zmq::socket_t *socket, std::string_view payload, int flags = 0) { zmq::message_t message(payload.size()); - ::memcpy(message.data(), payload.data(), payload.size()); + if (payload.size()) { + ::memcpy(message.data(), payload.data(), payload.size()); + } return socket->send(message, flags); }