generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-12-23 14:03:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #401 from gummif/gfa/msg-ub

Browse Source 
Problem: UB in message_t constructor
This commit is contained in:
Simon Giesecke
2020-05-14 12:04:22 +02:00
committed by GitHub
parent 3746e5c2d5 1793a5b586
commit a6ca65cbfc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zmq.hpp
View File

@@ -365,7 +365,12 @@ class message_t
int rc = zmq_msg_init_size(&msg, size_); int rc = zmq_msg_init_size(&msg, size_);
if (rc != 0) if (rc != 0)
throw error_t(); throw error_t();
memcpy(data(), data_, size_); if (size_)
{
// this constructor allows (nullptr, 0),
// memcpy with a null pointer is UB
memcpy(data(), data_, size_);
}
} }
message_t(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR) message_t(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR)