deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: correctly handle the case if uip_sappdata is NULL.

Browse source
This commit is contained in:
Adam Dunkels 2013-11-22 15:38:20 +01:00
parent f31d6f271f
commit d577d03e21
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/net/uip6.c
View file

@ -2320,12 +2320,23 @@ uip_send(const void *data, int len)
{ {
int copylen; int copylen;
#define MIN(a,b) ((a) < (b)? (a): (b)) #define MIN(a,b) ((a) < (b)? (a): (b))
copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -
(int)((char *)uip_sappdata - (char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN])); if(uip_sappdata != NULL) {
copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -
(int)((char *)uip_sappdata -
(char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN]));
} else {
copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN);
}
if(copylen > 0) { if(copylen > 0) {
uip_slen = copylen; uip_slen = copylen;
if(data != uip_sappdata) { if(data != uip_sappdata) {
memcpy(uip_sappdata, (data), uip_slen); if(uip_sappdata == NULL) {
memcpy((char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN],
(data), uip_slen);
} else {
memcpy(uip_sappdata, (data), uip_slen);
}
} }
} }
} }