Apple-2-SW
/
contiki
mirror of https://github.com/oliverschmidt/contiki.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2228 from alexandruioanp/ws-null-term 

Terminate websocket strings
This commit is contained in:
Adam Dunkels 2017-09-25 14:28:44 +02:00 committed by GitHub
parent ea788f3719 4586cfcb4b
commit 0875517d6e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/net/ipv6/websocket-http-client.c
View File

@ -228,21 +228,23 @@ websocket_http_client_register(struct websocket_http_client_state *s,
return -1;
}
strncpy(s->host, host, sizeof(s->host));
s->host[sizeof(s->host) - 1] = '\0';
if(file == NULL) {
return -1;
}
strncpy(s->file, file, sizeof(s->file));
s->file[sizeof(s->file) - 1] = '\0';
if(subprotocol == NULL) {
return -1;
}
strncpy(s->subprotocol, subprotocol, sizeof(s->subprotocol));
s->subprotocol[sizeof(s->subprotocol) - 1] = '\0';
if(header == NULL) {
strncpy(s->header, "", sizeof(s->header));
} else {
strncpy(s->header, header, sizeof(s->header));
memset(s->header, 0, sizeof(s->header));
if(header != NULL) {
strncpy(s->header, header, sizeof(s->header) - 1);
}
if(port == 0) {