generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 13:47:13 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes to doc ; added zmq_msg_init_data() assert preventing deferred segfault

Browse Source
This commit is contained in:
Uli Köhler
2013-08-18 22:50:50 +02:00
parent bcfe863fd4
commit 9c2740d9fa
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msg.cpp
View File

@@ -58,7 +58,7 @@ int zmq::msg_t::init_size (size_t size_)
u.lmsg.flags = 0;
u.lmsg.content =
(content_t*) malloc (sizeof (content_t) + size_);
if (!u.lmsg.content) {
if (unlikely (!u.lmsg.content)) {
errno = ENOMEM;
return -1;
}
@@ -75,7 +75,9 @@ int zmq::msg_t::init_size (size_t size_)
int zmq::msg_t::init_data (void *data_, size_t size_, msg_free_fn *ffn_,
void *hint_)
{
// Initialize constant message if there's no need to deallocate
// If data is NULL and size is not 0, a segfault
// would occur once the data is accessed
assert (data_ != NULL || size_ == 0);
if(ffn_ == NULL) {
u.cmsg.type = type_cmsg;
u.cmsg.flags = 0;