7 files changed, 14 insertions, 14 deletions
diff --git a/gr-zeromq/lib/base_impl.cc b/gr-zeromq/lib/base_impl.cc
index cd1825141b..0465ec3abb 100644
--- a/gr-zeromq/lib/base_impl.cc
+++ b/gr-zeromq/lib/base_impl.cc
@@ -57,8 +57,8 @@ namespace gr {
     std::string
     base_impl::last_endpoint()
     {
-      size_t addr_len = 256;
-      char addr[addr_len];
+      char addr[256];
+      size_t addr_len = sizeof(addr);
       d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
       return std::string(addr, addr_len-1);
     }
diff --git a/gr-zeromq/lib/pub_msg_sink_impl.h b/gr-zeromq/lib/pub_msg_sink_impl.h
index c421361e18..0cedfed482 100644
--- a/gr-zeromq/lib/pub_msg_sink_impl.h
+++ b/gr-zeromq/lib/pub_msg_sink_impl.h
@@ -42,8 +42,8 @@ namespace gr {
 
       void handler(pmt::pmt_t msg);
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }
diff --git a/gr-zeromq/lib/pull_msg_source_impl.h b/gr-zeromq/lib/pull_msg_source_impl.h
index 4c28a65e56..25cd2dee31 100644
--- a/gr-zeromq/lib/pull_msg_source_impl.h
+++ b/gr-zeromq/lib/pull_msg_source_impl.h
@@ -50,8 +50,8 @@ namespace gr {
       bool stop();
 
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }
diff --git a/gr-zeromq/lib/push_msg_sink_impl.h b/gr-zeromq/lib/push_msg_sink_impl.h
index 2cd487d743..0d0503cd55 100644
--- a/gr-zeromq/lib/push_msg_sink_impl.h
+++ b/gr-zeromq/lib/push_msg_sink_impl.h
@@ -42,8 +42,8 @@ namespace gr {
 
       void handler(pmt::pmt_t msg);
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }
diff --git a/gr-zeromq/lib/rep_msg_sink_impl.h b/gr-zeromq/lib/rep_msg_sink_impl.h
index 7b13e93952..6f788690c9 100644
--- a/gr-zeromq/lib/rep_msg_sink_impl.h
+++ b/gr-zeromq/lib/rep_msg_sink_impl.h
@@ -50,8 +50,8 @@ namespace gr {
       bool stop();
 
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }
diff --git a/gr-zeromq/lib/req_msg_source_impl.h b/gr-zeromq/lib/req_msg_source_impl.h
index 61d80104d1..c9e81efc5d 100644
--- a/gr-zeromq/lib/req_msg_source_impl.h
+++ b/gr-zeromq/lib/req_msg_source_impl.h
@@ -50,8 +50,8 @@ namespace gr {
       bool stop();
 
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }
diff --git a/gr-zeromq/lib/sub_msg_source_impl.h b/gr-zeromq/lib/sub_msg_source_impl.h
index e1c2e07788..f0367c6c70 100644
--- a/gr-zeromq/lib/sub_msg_source_impl.h
+++ b/gr-zeromq/lib/sub_msg_source_impl.h
@@ -50,8 +50,8 @@ namespace gr {
       bool stop();
 
       std::string last_endpoint() override {
-        size_t addr_len = 256;
-        char addr[addr_len];
+        char addr[256];
+        size_t addr_len = sizeof(addr);
         d_socket->getsockopt(ZMQ_LAST_ENDPOINT, addr, &addr_len);
         return std::string(addr, addr_len-1);
       }