gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gracefully handle invalid addrlen value in recvfrom

Browse Source
This commit is contained in:
Joseph Henry
2017-03-22 16:51:43 -07:00
parent 52d01b9e85
commit 932135bb1a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sockets.c
View File

@@ -326,7 +326,10 @@ int (*realclose)(CLOSE_SIG);
} }
if(n > 0) { if(n > 0) {
// TODO: case for address size mismatch? // For cases where *addrlen is an unreasonable value
// FIXME: This should probably have some more thought put into it
*addrlen = *addrlen > SDK_MTU ? 0 : *addrlen;
memcpy(addr, tmpbuf, *addrlen); memcpy(addr, tmpbuf, *addrlen);
memcpy(&tmpsz, tmpbuf + sizeof(struct sockaddr_storage), sizeof(tmpsz)); memcpy(&tmpsz, tmpbuf + sizeof(struct sockaddr_storage), sizeof(tmpsz));
memcpy(&pnum, tmpbuf + sizeof(struct sockaddr_storage) + sizeof(int), sizeof(int)); memcpy(&pnum, tmpbuf + sizeof(struct sockaddr_storage) + sizeof(int), sizeof(int));