mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-17 04:50:57 +08:00
Merge branch 'maint'
* maint: values of RATE, RECOVERY_IVL and SWAP options are checked for negative values
This commit is contained in:
commit
ff1080728f
@ -53,7 +53,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case ZMQ_SWAP:
|
case ZMQ_SWAP:
|
||||||
if (optvallen_ != sizeof (int64_t)) {
|
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -82,7 +82,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case ZMQ_RATE:
|
case ZMQ_RATE:
|
||||||
if (optvallen_ != sizeof (int64_t)) {
|
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -90,7 +90,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case ZMQ_RECOVERY_IVL:
|
case ZMQ_RECOVERY_IVL:
|
||||||
if (optvallen_ != sizeof (int64_t)) {
|
if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
|
||||||
errno = EINVAL;
|
errno = EINVAL;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user