brejela
/
lua-zmq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in {set,get}sockoption with zmq 3.2.1

Browse Source 
$ lua examples/server_poll.lua
	Invalid socket option type, this shouldn't happen.
	Aborted (core dumped)

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Robert G. Jakabosky <bobby@sharedrealm.com>
pull/47/merge
Petr Štetiar 14 years ago committed by Robert G. Jakabosky
parent 32ea196579
commit 4642135e12
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
src/socket.nobj.lua
Unescape Escape View File

@ -504,7 +504,7 @@ end
size_t val_len; size_t val_len;
const void *val; const void *val;
#if VERSION_2_1 #if defined(VERSION_2_1) || defined(VERSION_3_0)
socket_t fd_val; socket_t fd_val;
#endif #endif
int int_val; int int_val;
@ -531,7 +531,7 @@ end
} }
switch(opt_types[${opt}]) { switch(opt_types[${opt}]) {
#if VERSION_2_1 #if defined(VERSION_2_1) || defined(VERSION_3_0)
case OPT_TYPE_FD: case OPT_TYPE_FD:
fd_val = luaL_checklong(L, ${val::idx}); fd_val = luaL_checklong(L, ${val::idx});
val = &fd_val; val = &fd_val;
@ -588,7 +588,7 @@ local tmp_val_len = ffi.new('size_t[1]', 4)
c_source[[ c_source[[
size_t val_len; size_t val_len;
#if VERSION_2_1 #if defined(VERSION_2_1) || defined(VERSION_3_0)
socket_t fd_val; socket_t fd_val;
#endif #endif
int int_val; int int_val;
@ -605,7 +605,7 @@ local tmp_val_len = ffi.new('size_t[1]', 4)
} }
switch(opt_types[${opt}]) { switch(opt_types[${opt}]) {
#if VERSION_2_1 #if defined(VERSION_2_1) || defined(VERSION_3_0)
case OPT_TYPE_FD: case OPT_TYPE_FD:
val_len = sizeof(fd_val); val_len = sizeof(fd_val);
${err} = zmq_getsockopt(${this}, ${opt}, &fd_val, &val_len); ${err} = zmq_getsockopt(${this}, ${opt}, &fd_val, &val_len);

Write Preview
Loading…
Cancel
Save