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

Fixed build: malformed only defined when needed.

Browse Source
This commit is contained in:
Pieter Hintjens
2014-06-17 16:14:19 +02:00
parent b4ed3f5506
commit d0667461f0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/options.cpp
View File

@@ -65,8 +65,9 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
{ {
bool is_int = (optvallen_ == sizeof (int)); bool is_int = (optvallen_ == sizeof (int));
int value = is_int? *((int *) optval_): 0; int value = is_int? *((int *) optval_): 0;
#if defined (ZMQ_ACT_MILITANT)
bool malformed = true; // Did caller pass a bad option value? bool malformed = true; // Did caller pass a bad option value?
#endif
switch (option_) { switch (option_) {
case ZMQ_SNDHWM: case ZMQ_SNDHWM:
if (is_int && value >= 0) { if (is_int && value >= 0) {
@@ -442,11 +443,13 @@ int zmq::options_t::setsockopt (int option_, const void *optval_,
break; break;
default: default:
#if defined (ZMQ_ACT_MILITANT)
// There are valid scenarios for probing with unknown socket option // There are valid scenarios for probing with unknown socket option
// values, e.g. to check if security is enabled or not. This will not // values, e.g. to check if security is enabled or not. This will not
// provoke a militant assert. However, passing bad values to a valid // provoke a militant assert. However, passing bad values to a valid
// socket option will, if ZMQ_ACT_MILITANT is defined. // socket option will, if ZMQ_ACT_MILITANT is defined.
malformed = false; malformed = false;
#endif
break; break;
} }
#if defined (ZMQ_ACT_MILITANT) #if defined (ZMQ_ACT_MILITANT)