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

Merge pull request #2909 from eponsko/master

Browse Source 
Problem:  ZMQ_DISH triggers assert when hitting the watermark(?)
This commit is contained in:
Luca Boccassi 2018-02-02 15:36:08 +01:00 committed by GitHub
commit a45e4bb7bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dish.cpp
View File

@ -285,14 +285,19 @@ int zmq::dish_session_t::push_msg (msg_t *msg_)
return 0;
}
else {
const char *group_setting = msg_->group();
int rc;
if(group_setting[0] != 0)
goto has_group;
// Set the message group
int rc = msg_->set_group ((char*)group_msg.data (), group_msg. size());
rc = msg_->set_group ((char*)group_msg.data (), group_msg. size());
errno_assert (rc == 0);
// We set the group, so we don't need the group_msg anymore
rc = group_msg.close ();
errno_assert (rc == 0);
has_group:
// Thread safe socket doesn't support multipart messages
if ((msg_->flags() & msg_t::more) == msg_t::more) {
errno = EFAULT;