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

Problem: zmq_ctx_get API broken

Browse Source 
Solution: restore EINVAL as errno on unknown option.
Broken by https://github.com/zeromq/libzmq/pull/3642 which started to
return EFAULT instead
This commit is contained in:
Luca Boccassi 2020-09-10 22:30:00 +01:00
parent 44786232f7
commit 792ffe4d7a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/zmq.cpp
View File

@ -195,15 +195,12 @@ int zmq_ctx_set_ext (void *ctx_,
int zmq_ctx_get (void *ctx_, int option_) int zmq_ctx_get (void *ctx_, int option_)
{ {
int optval = 0; if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
size_t optvallen = sizeof (int);
if (zmq_ctx_get_ext (ctx_, option_, &optval, &optvallen) == 0) {
return optval;
}
errno = EFAULT; errno = EFAULT;
return -1; return -1;
} }
return (static_cast<zmq::ctx_t *> (ctx_))->get (option_);
}
int zmq_ctx_get_ext (void *ctx_, int option_, void *optval_, size_t *optvallen_) int zmq_ctx_get_ext (void *ctx_, int option_, void *optval_, size_t *optvallen_)
{ {

9
tests/test_ctx_options.cpp
View File

@ -283,6 +283,14 @@ void test_ctx_option_blocky ()
test_context_socket_close (router); test_context_socket_close (router);
} }
void test_ctx_option_invalid ()
{
TEST_ASSERT_EQUAL_INT (-1, zmq_ctx_set (get_test_context (), -1, 0));
TEST_ASSERT_EQUAL_INT (EINVAL, errno);
TEST_ASSERT_EQUAL_INT (-1, zmq_ctx_get (get_test_context (), -1));
TEST_ASSERT_EQUAL_INT (EINVAL, errno);
}
int main (void) int main (void)
{ {
setup_test_environment (); setup_test_environment ();
@ -297,5 +305,6 @@ int main (void)
RUN_TEST (test_ctx_thread_opts); RUN_TEST (test_ctx_thread_opts);
RUN_TEST (test_ctx_zero_copy); RUN_TEST (test_ctx_zero_copy);
RUN_TEST (test_ctx_option_blocky); RUN_TEST (test_ctx_option_blocky);
RUN_TEST (test_ctx_option_invalid);
return UNITY_END (); return UNITY_END ();
} }