luci-0.10: merge r7297

diff --git a/libs/nixio/src/io.c b/libs/nixio/src/io.c
index 84bc84f6da2b6a192c079345831a24b558ef6f8e..1d8f4484c6d72f590640b2861099233412ed35fa 100644 (file)
--- a/libs/nixio/src/io.c
+++ b/libs/nixio/src/io.c
@@ -179,7 +179,7 @@ static int nixio_sock__recvfrom(lua_State *L, int from) {
                        }
                }
 #ifndef __WINNT__
-               else if (sock->domain == AF_UNIX) {
+               else if (sock->domain == AF_UNIX && alen > sizeof(sa_family_t)) {
                        lua_pushstring(L, addr_un.sun_path);
                        return 2;
                }