3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-17 08:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Problem: zmq_msg_gets did not set errno on unknown properties

Browse Source 
Solution: set errno to EINVAL when a property does not exist.

Also fixed test_metadata.cpp to test this case.
This commit is contained in:
Pieter Hintjens 2014-06-25 17:22:02 +02:00
parent 6e91330a0c
commit dd05a64462
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zmq.cpp
View File

@ -648,10 +648,15 @@ int zmq_msg_set (zmq_msg_t *, int, int)
const char *zmq_msg_gets (zmq_msg_t *msg_, const char *property_) const char *zmq_msg_gets (zmq_msg_t *msg_, const char *property_)
{ {
zmq::metadata_t *metadata = ((zmq::msg_t*) msg_)->metadata (); zmq::metadata_t *metadata = ((zmq::msg_t*) msg_)->metadata ();
const char *value = NULL;
if (metadata) if (metadata)
return metadata->get (std::string (property_)); value = metadata->get (std::string (property_));
else if (value)
return value;
else {
errno = EINVAL;
return NULL; return NULL;
}
} }
// Polling. // Polling.

2
tests/test_metadata.cpp
View File

@ -100,6 +100,8 @@ int main (void)
assert (streq (zmq_msg_gets (&msg, "Hello"), "World")); assert (streq (zmq_msg_gets (&msg, "Hello"), "World"));
assert (streq (zmq_msg_gets (&msg, "Socket-Type"), "DEALER")); assert (streq (zmq_msg_gets (&msg, "Socket-Type"), "DEALER"));
assert (streq (zmq_msg_gets (&msg, "User-Id"), "anonymous")); assert (streq (zmq_msg_gets (&msg, "User-Id"), "anonymous"));
assert (zmq_msg_gets (&msg, "No Such") == NULL);
assert (zmq_errno () == EINVAL);
zmq_msg_close (&msg); zmq_msg_close (&msg);
close_zero_linger (client); close_zero_linger (client);