From 0d50fad855e86edb9dfd7f0773afd262265b1e64 Mon Sep 17 00:00:00 2001 From: wanghao-free Date: Tue, 28 Sep 2021 20:10:13 -0700 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3release1.0.1?= =?UTF-8?q?=E5=88=86=E6=94=AF=E5=86=85=E6=A0=B8=E5=85=B3=E9=97=AD=E4=B8=AD?= =?UTF-8?q?=E6=96=AD=E5=90=8E=E5=9C=A8=E5=86=99BUFF=E6=BB=A1=E4=BA=86?= =?UTF-8?q?=E5=90=8E=E5=8D=A1=E4=BD=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主干存在该问题，release分支先合入 添加cnt==0以及关中断的判断条件，在符合这种情况时跳出死循环，避免卡住 Signed-off-by: wanghao-free --- kernel/common/los_printf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/common/los_printf.c b/kernel/common/los_printf.c index 40133286..4a12a3f1 100755 --- a/kernel/common/los_printf.c +++ b/kernel/common/los_printf.c @@ -98,7 +98,7 @@ STATIC VOID ConsoleOutput(const CHAR *str, UINT32 len) for (;;) { cnt = write(STDOUT_FILENO, str + writen, (size_t)toWrite); - if ((cnt < 0) || (toWrite == cnt)) { + if ((cnt < 0) || ((cnt == 0) && OS_INT_ACTIVE) || (toWrite == cnt)) { break; } writen += cnt;