Merge branch 'maint'

* maint: values of RATE, RECOVERY_IVL and SWAP options are checked for negative values

Merge branch 'maint'
* maint: values of RATE, RECOVERY_IVL and SWAP options are checked for negative values
ff108072 · Martin Sustrik · be159b63 · e2802d9a · ff108072
Commit ff108072 authored Sep 15, 2010 by Martin Sustrik
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

options.cpp src/options.cpp +3 -3

No files found.
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -53,7 +53,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
        return 0;

    case ZMQ_SWAP:
-        if (optvallen_ != sizeof (int64_t)) {
+        if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
            errno = EINVAL;
            return -1;
        }
@@ -82,7 +82,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
        return 0;

    case ZMQ_RATE:
-        if (optvallen_ != sizeof (int64_t)) {
+        if (optvallen_ != sizeof (int64_t) || *((int64_t*) optval_) < 0) {
            errno = EINVAL;
            return -1;
        }
@@ -90,7 +90,7 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
        return 0;
        
    case ZMQ_RECOVERY_IVL:
-        if (optvallen_ != sizeof (int64_t)) {
+        if (optvallen_ != sizeof (int64_t)  || *((int64_t*) optval_) < 0) {
            errno = EINVAL;
            return -1;
        }