diff options
| author | liukangcc <[email protected]> | 2021-10-13 18:04:46 +0800 |
|---|---|---|
| committer | liukangcc <[email protected]> | 2021-10-14 09:43:46 +0800 |
| commit | c99dfc3147ef08ef62e729dc2860e06ad90380d3 (patch) | |
| tree | f1678555c1c8439f1f28a5960d0fb114904122db | |
| parent | e3045389d0b9e1157571c961cf77e271d0aaf3a7 (diff) | |
[update] fix finsh_getchar() 未对 shell->device 为空处理的问题
| -rw-r--r-- | components/finsh/shell.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/components/finsh/shell.c b/components/finsh/shell.c index 48651d2c4f..7b577db6b6 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -151,15 +151,19 @@ char finsh_getchar(void) char ch = 0; RT_ASSERT(shell != RT_NULL); + if (shell->device == RT_NULL) + { + return -RT_ERROR; + } while (rt_device_read(shell->device, -1, &ch, 1) != 1) rt_sem_take(&shell->rx_sem, RT_WAITING_FOREVER); return ch; -#endif +#endif /* RT_USING_POSIX */ #else extern char rt_hw_console_getchar(void); return rt_hw_console_getchar(); -#endif +#endif /* RT_USING_DEVICE */ } #if !defined(RT_USING_POSIX) && defined(RT_USING_DEVICE) |
