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

Merge pull request #1090 from rajithr/patch-1

Browse source 
Protection against possible buffer overflow
This commit is contained in:
Simon Duquennoy 2015-09-28 13:29:45 +02:00
parent 1a6681a09d 2a2acf62ed
commit d65b3e1ab6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/packetbuf.c
View file

@ -141,6 +141,7 @@ packetbuf_copyto(void *to)
int i; int i;
char buffer[1000]; char buffer[1000];
char *bufferptr = buffer; char *bufferptr = buffer;
int bufferlen = 0;
bufferptr[0] = 0; bufferptr[0] = 0;
for(i = hdrptr; i < PACKETBUF_HDR_SIZE; ++i) { for(i = hdrptr; i < PACKETBUF_HDR_SIZE; ++i) {
@ -149,8 +150,8 @@ packetbuf_copyto(void *to)
PRINTF("packetbuf_write: header: %s\n", buffer); PRINTF("packetbuf_write: header: %s\n", buffer);
bufferptr = buffer; bufferptr = buffer;
bufferptr[0] = 0; bufferptr[0] = 0;
for(i = bufptr; i < buflen + bufptr; ++i) { for(i = bufptr; ((i < buflen + bufptr) && (bufferlen < (sizeof(buffer) - 10))); ++i) {
bufferptr += sprintf(bufferptr, "0x%02x, ", packetbufptr[i]); bufferlen += sprintf(bufferptr + bufferlen, "0x%02x, ", packetbufptr[i]);
} }
PRINTF("packetbuf_write: data: %s\n", buffer); PRINTF("packetbuf_write: data: %s\n", buffer);
} }