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

Made sure netcmds are null-terminated

Browse source
This commit is contained in:
adamdunkels 2009-04-06 21:17:34 +00:00
parent b41b79e3a9
commit 01d39d4149
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/shell/shell-rime-netcmd.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-rime-netcmd.c,v 1.6 2009/03/12 21:58:20 adamdunkels Exp $ * $Id: shell-rime-netcmd.c,v 1.7 2009/04/06 21:17:34 adamdunkels Exp $
*/ */
/** /**
@ -111,8 +111,14 @@ PROCESS_THREAD(shell_netcmd_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
/* Get the length of the command line, excluding a terminating NUL character. */
len = strlen((char *)data); len = strlen((char *)data);
if(len > PACKETBUF_SIZE) {
/* Check the length of the command line to see that it is small
enough to fit in a packet. We count with 32 bytes of header,
which may be a little too much, but at least we are on the safe
side. */
if(len > PACKETBUF_SIZE - 32) {
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%d", len); snprintf(buf, sizeof(buf), "%d", len);
shell_output_str(&netcmd_command, "command line too large: ", buf); shell_output_str(&netcmd_command, "command line too large: ", buf);
@ -120,8 +126,11 @@ PROCESS_THREAD(shell_netcmd_process, ev, data)
packetbuf_clear(); packetbuf_clear();
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
packetbuf_set_datalen(len + 2 + TRICKLEMSG_HDR_SIZE); packetbuf_set_datalen(len + 1 + TRICKLEMSG_HDR_SIZE);
strcpy(msg->netcmd, data); strcpy(msg->netcmd, data);
/* Terminate the string with a NUL character. */
msg->netcmd[len] = 0;
msg->crc = crc16_data(msg->netcmd, len, 0); msg->crc = crc16_data(msg->netcmd, len, 0);
/* printf("netcmd sending '%s'\n", msg->netcmd);*/ /* printf("netcmd sending '%s'\n", msg->netcmd);*/
trickle_send(&trickle); trickle_send(&trickle);
@ -138,15 +147,14 @@ recv_trickle(struct trickle_conn *c)
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
if(packetbuf_datalen() > 2 + TRICKLEMSG_HDR_SIZE) { if(packetbuf_datalen() > 1 + TRICKLEMSG_HDR_SIZE) {
/* First ensure that the old process is killed. */ /* First ensure that the old process is killed. */
process_exit(&shell_netcmd_server_process); process_exit(&shell_netcmd_server_process);
len = packetbuf_datalen() - 2 - TRICKLEMSG_HDR_SIZE; len = packetbuf_datalen() - 1 - TRICKLEMSG_HDR_SIZE;
/* Make sure that the incoming command is null-terminated (which /* Make sure that the incoming command is null-terminated. */
is should be already). */
msg->netcmd[len] = 0; msg->netcmd[len] = 0;
if(msg->crc == crc16_data(msg->netcmd, len, 0)) { if(msg->crc == crc16_data(msg->netcmd, len, 0)) {