From: "Gaël PORTAY" <gael.portay@savoirfairelinux.com>
To: barebox@lists.infradead.org
Cc: "Gaël PORTAY" <gael.portay@savoirfairelinux.com>
Subject: [PATCH v2 1/2] readline_simple: return -1 if getc fails
Date: Wed, 9 Aug 2017 00:13:19 -0400 [thread overview]
Message-ID: <20170809041320.28874-2-gael.portay@savoirfairelinux.com> (raw)
In-Reply-To: <20170809041320.28874-1-gael.portay@savoirfairelinux.com>
The getc function may return an errno code if an error happens.
This patch prevents readline from printing a non printable character and
from looping to infinity and beyong.
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
lib/readline_simple.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/readline_simple.c b/lib/readline_simple.c
index c4d3d240e..7dd18e426 100644
--- a/lib/readline_simple.c
+++ b/lib/readline_simple.c
@@ -47,7 +47,7 @@ int readline (const char *prompt, char *line, int len)
int n = 0; /* buffer index */
int plen = 0; /* prompt length */
int col; /* output column cnt */
- char c;
+ int c;
/* print prompt */
if (prompt) {
@@ -58,6 +58,10 @@ int readline (const char *prompt, char *line, int len)
for (;;) {
c = getchar();
+ if (c < 0) {
+ *p = '\0';
+ return (-1);
+ }
/*
* Special character handling
--
2.13.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-08-09 4:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 4:13 [PATCH 0/2] " Gaël PORTAY
2017-08-09 4:13 ` Gaël PORTAY [this message]
2017-08-09 4:13 ` [PATCH v2 2/2] readline_simple: remove obsolete documentation Gaël PORTAY
2017-08-09 6:05 ` [PATCH 0/2] readline_simple: return -1 if getc fails Oleksij Rempel
2017-08-09 18:58 ` Gaël PORTAY
2017-08-09 19:41 ` Oleksij Rempel
2017-08-10 5:51 ` Antony Pavlov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170809041320.28874-2-gael.portay@savoirfairelinux.com \
--to=gael.portay@savoirfairelinux.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox