Merge pull request #14 from scemama/master

scemama · web-flow · commit ef8624729c5a · 2016-09-15T11:05:48.000+02:00
Better handling of setsockopt
diff --git a/f77_zmq.c b/f77_zmq.c
@@ -207,7 +207,12 @@ int f77_zmq_disconnect_ (void* *socket, char* address_in, int address_len)
 
 int f77_zmq_setsockopt_ (void* *socket, int* option_name, void* option_value, int* option_len, int dummy)
 {
-  return zmq_setsockopt (*socket, *option_name, option_value, *option_len);
+  int result;
+  void * value = malloc(*option_len);
+  memcpy(value, option_value, (size_t) *option_len);
+  result = zmq_setsockopt (*socket, *option_name, value, *option_len);
+  free(value);
+  return result;
 }
 
 int f77_zmq_getsockopt_ (void* *socket, int* option_name, void *option_value, int *option_len, int dummy)

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,12 @@ int f77_zmq_disconnect_ (void* socket, char address_in, int address_len)`
`207`	`207`
`208`	`208`	`int f77_zmq_setsockopt_ (void* socket, int option_name, void* option_value, int* option_len, int dummy)`
`209`	`209`	`{`
`210`		`- return zmq_setsockopt (socket, option_name, option_value, *option_len);`
	`210`	`+ int result;`
	`211`	`+ void * value = malloc(*option_len);`
	`212`	`+ memcpy(value, option_value, (size_t) *option_len);`
	`213`	`+ result = zmq_setsockopt (socket, option_name, value, *option_len);`
	`214`	`+ free(value);`
	`215`	`+ return result;`
`211`	`216`	`}`
`212`	`217`
`213`	`218`	`int f77_zmq_getsockopt_ (void* socket, int option_name, void option_value, int option_len, int dummy)`