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

Guard against NULL input, remove unguarded printf()

Browse source
This commit is contained in:
adamdunkels 2008-11-09 10:50:14 +00:00
parent b6e76a4947
commit 6677b949b8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/serial-shell/serial-shell.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: serial-shell.c,v 1.1 2008/07/09 20:53:30 adamdunkels Exp $ * $Id: serial-shell.c,v 1.2 2008/11/09 10:50:14 adamdunkels Exp $
*/ */
/** /**
@ -54,6 +54,14 @@ PROCESS(serial_shell_process, "Contiki serial shell");
void void
shell_default_output(const char *text1, int len1, const char *text2, int len2) shell_default_output(const char *text1, int len1, const char *text2, int len2)
{ {
if(text1 == NULL) {
text1 = "";
len1 = 0;
}
if(text2 == NULL) {
text2 = "";
len2 = 0;
}
printf("%.*s%.*s\r\n", len1, text1, len2, text2); printf("%.*s%.*s\r\n", len1, text1, len2, text2);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -72,7 +80,6 @@ PROCESS_THREAD(serial_shell_process, ev, data)
while(1) { while(1) {
PROCESS_WAIT_EVENT_UNTIL(ev == serial_event_message && data != NULL); PROCESS_WAIT_EVENT_UNTIL(ev == serial_event_message && data != NULL);
/* printf("input: '%s'\n", (char *)data);*/
shell_input(data, strlen(data)); shell_input(data, strlen(data));
} }