From: Sascha Hauer <s.hauer@pengutronix.de>
To: Bastian Stender <bst@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v3] fbconsole: check cursor position before moving
Date: Tue, 28 Feb 2017 07:46:05 +0100 [thread overview]
Message-ID: <20170228064605.4a3aqhgiwdzhw6q2@pengutronix.de> (raw)
In-Reply-To: <20170227133930.1230-1-bst@pengutronix.de>
On Mon, Feb 27, 2017 at 02:39:30PM +0100, Bastian Stender wrote:
> Moving the cursor to x=2, y=2 with "\e[3;3H" on a 12x2 framebuffer
> console lead to a barebox crash while drawing the cursor. If the
> cursor position is out of bounds clip the cursor to the corresponding
> edge.
>
> Signed-off-by: Bastian Stender <bst@pengutronix.de>
Applied, thanks
Sascha
> ---
> drivers/video/fbconsole.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
> index 64f7d7364e..33649c597d 100644
> --- a/drivers/video/fbconsole.c
> +++ b/drivers/video/fbconsole.c
> @@ -264,10 +264,13 @@ static void fbc_parse_csi(struct fbc_priv *priv)
> return;
> case 'H':
> video_invertchar(priv, priv->x, priv->y);
> +
> pos = simple_strtoul(priv->csi, &end, 10);
> - priv->y = pos ? pos - 1 : 0;
> + priv->y = clamp(pos - 1, 0, (int) priv->rows);
> +
> pos = simple_strtoul(end + 1, NULL, 10);
> - priv->x = pos ? pos - 1 : 0;
> + priv->x = clamp(pos - 1, 0, (int) priv->cols);
> +
> video_invertchar(priv, priv->x, priv->y);
> case 'K':
> pos = simple_strtoul(priv->csi, &end, 10);
> --
> 2.11.0
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2017-02-28 6:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 17:20 [PATCH 1/2] " Bastian Stender
2017-02-23 17:20 ` [PATCH 2/2] fbconsole: implement vt100 cursor shown/hidden Bastian Stender
2017-02-24 7:32 ` [PATCH 1/2] fbconsole: check cursor position before moving Sascha Hauer
2017-02-24 11:18 ` Ian Abbott
2017-02-24 13:22 ` Bastian Stender
2017-02-24 13:36 ` [PATCH v2] " Bastian Stender
2017-02-27 7:57 ` Sascha Hauer
2017-02-27 13:39 ` [PATCH v3] " Bastian Stender
2017-02-27 18:46 ` Ian Abbott
2017-02-27 18:51 ` Ian Abbott
2017-02-28 6:46 ` Sascha Hauer [this message]
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=20170228064605.4a3aqhgiwdzhw6q2@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=bst@pengutronix.de \
/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