diff --git a/lib/zclient.c b/lib/zclient.c
index 9188c01..610008b 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -794,7 +794,7 @@
   ifp->ll_type = stream_getl (s);
   ifp->hw_addr_len = stream_getl (s);
   if (ifp->hw_addr_len)
-    stream_get (ifp->hw_addr, s, ifp->hw_addr_len);
+    stream_get (ifp->hw_addr, s, MIN(ifp->hw_addr_len, INTERFACE_HWADDR_MAX));
 }
 
 static int