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

Make sure the url is null terminated in CoAP observe.

Browse source
This commit is contained in:
Niclas Finne 2015-06-04 21:13:50 +02:00
parent 7edf6e60e9
commit d764e09f35
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/er-coap/er-coap-observe.c
View file

@ -196,10 +196,12 @@ coap_notify_observers_sub(resource_t *resource, const char *subpath)
char url[COAP_OBSERVER_URL_LEN];
url_len = strlen(resource->url);
strncpy(url, resource->url, COAP_OBSERVER_URL_LEN);
if(strlen(url) < COAP_OBSERVER_URL_LEN && subpath != NULL) {
strncpy(&url[url_len], subpath, COAP_OBSERVER_URL_LEN - url_len);
strncpy(url, resource->url, COAP_OBSERVER_URL_LEN - 1);
if(url_len < COAP_OBSERVER_URL_LEN - 1 && subpath != NULL) {
strncpy(&url[url_len], subpath, COAP_OBSERVER_URL_LEN - url_len - 1);
}
/* Ensure url is null terminated because strncpy does not guarantee this */
url[COAP_OBSERVER_URL_LEN - 1] = '\0';
/* url now contains the notify URL that needs to match the observer */
PRINTF("Observe: Notification from %s\n", url);