status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

bsd/getroute.c: fix parsing of address with SA_LEN() = 0 

at least with OpenBSD 4.3, the minimum is 4 bytes
This commit is contained in:
Thomas Bernard 2015-11-18 09:52:54 +01:00
parent e5d30a1f4b
commit 35aae6debb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
miniupnpd/bsd/getroute.c
View File

@ -1,7 +1,7 @@
/* $Id: getroute.c,v 1.9 2015/11/17 09:54:00 nanard Exp $ */ /* $Id: getroute.c,v 1.11 2015/11/18 08:49:26 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2013 Thomas Bernard * (c) 2006-2015 Thomas Bernard
* This software is subject to the conditions detailed * This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */ * in the LICENCE file provided within the distribution */
@ -82,7 +82,7 @@ get_src_for_route_to(const struct sockaddr * dst,
return -1; return -1;
} }
syslog(LOG_DEBUG, "read l=%d seq=%d pid=%d sizeof(struct rt_msghdr)=%d", syslog(LOG_DEBUG, "read l=%d seq=%d pid=%d sizeof(struct rt_msghdr)=%d",
l, rtm.rtm_seq, rtm.rtm_pid, sizeof(struct rt_msghdr)); l, rtm.rtm_seq, rtm.rtm_pid, (int)sizeof(struct rt_msghdr));
} while(l > 0 && (rtm.rtm_pid != getpid() || rtm.rtm_seq != 1)); } while(l > 0 && (rtm.rtm_pid != getpid() || rtm.rtm_seq != 1));
close(s); close(s);
p = m_rtmsg.m_space; p = m_rtmsg.m_space;
@ -124,7 +124,12 @@ get_src_for_route_to(const struct sockaddr * dst,
*index = sdl->sdl_index; *index = sdl->sdl_index;
} }
#endif #endif
p += SA_SIZE(sa); /* at least 4 bytes per address are reserved,
* that is true with OpenBSD 4.3 */
if(SA_SIZE(sa) > 0)
p += SA_SIZE(sa);
else
p += 4;
} }
} }
} }