From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jul 2011 09:05:10 +0000 (+0000)
Subject: luci-0.10: merge r7297
X-Git-Tag: 0.10.0~98
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e049665fe2ee369c04c2bf9b50dbb61946e63115;p=oweals%2Fluci.git

luci-0.10: merge r7297
---

diff --git a/libs/nixio/src/io.c b/libs/nixio/src/io.c
index 84bc84f6d..1d8f4484c 100644
--- 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;
 		}