From: Markus Armbruster <armbru@redhat.com>
To: Laszlo Ersek <lersek@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] TextConsole: saturate escape parameter in TTY_STATE_CSI
Date: Mon, 17 Sep 2012 13:56:27 +0200 [thread overview]
Message-ID: <87k3vsoob8.fsf@blackfin.pond.sub.org> (raw)
In-Reply-To: <1347873003-11593-1-git-send-email-lersek@redhat.com> (Laszlo Ersek's message of "Mon, 17 Sep 2012 11:10:03 +0200")
Laszlo Ersek <lersek@redhat.com> writes:
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> Build tested.
> console.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/console.c b/console.c
> index c1ed5e0..67080f4 100644
> --- a/console.c
> +++ b/console.c
> @@ -938,8 +938,11 @@ static void console_putchar(TextConsole *s, int ch)
> case TTY_STATE_CSI: /* handle escape sequence parameters */
> if (ch >= '0' && ch <= '9') {
> if (s->nb_esc_params < MAX_ESC_PARAMS) {
> - s->esc_params[s->nb_esc_params] =
> - s->esc_params[s->nb_esc_params] * 10 + ch - '0';
> + int *param = &s->esc_params[s->nb_esc_params];
> + int digit = (ch - '0');
> +
> + *param = (*param <= (INT_MAX - digit) / 10) ?
> + *param * 10 + digit : INT_MAX;
> }
> } else {
> if (s->nb_esc_params < MAX_ESC_PARAMS)
Before this patch, silent integer overflow. Exact behavior depends on
hosts int type. For instance, \e[4294967296 is the same as \e[0 with 32
bit int, but with 64 bit int.
What does a real vt100 do? I don't have one anymore. For what it's
worth, both xterm and Xfce Terminal appear to saturate at some "big"
number ("big" compared to the argument values that are actually useful;
INT_MAX should do fine). In particular, \e[4294967296 does *not* behave
like \e[0.
Therefore, changing QEMU to saturate makes sense.
Reviewed-by: Markus Armbruster <armbru@redhat.com>
next prev parent reply other threads:[~2012-09-17 11:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 9:10 [Qemu-devel] [PATCH] TextConsole: saturate escape parameter in TTY_STATE_CSI Laszlo Ersek
2012-09-17 11:56 ` Markus Armbruster [this message]
2012-09-22 16:13 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
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=87k3vsoob8.fsf@blackfin.pond.sub.org \
--to=armbru@redhat.com \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.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;
as well as URLs for NNTP newsgroup(s).