qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: William Hu <purplearmadillo77@proton.me>,
	"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [PATCH] ui/curses: Fix infinite loop on windows
Date: Tue, 8 Apr 2025 21:01:31 +0200	[thread overview]
Message-ID: <19616b23-6b86-4f64-9836-fbfda79c76b8@linaro.org> (raw)
In-Reply-To: <tSO5to8--iex6QMThG3Z8ElfnNOUahK_yitw2G2tEVRPoMKV936CBdrpyfbeNpVEpziKqeQ1ShBwPOoDkofgApM8YWwnPKJR_JrPDThV8Bc=@proton.me>

On 3/4/25 03:07, William Hu via wrote:
>  From a42046272f0544dd18ed58661e53ea17d1584c2c Mon Sep 17 00:00:00 2001
> From: William Hu <purplearmadillo77@proton.me>
> Date: Wed, 2 Apr 2025 12:00:00 -0400
> Subject: [PATCH] ui/curses: Fix infinite loop on windows
> 
> Replace -1 comparisons for wint_t with WEOF to fix infinite loop caused by a
> 65535 == -1 comparison.
> 
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2905
> Signed-off-by: William Hu <purplearmadillo77@proton.me>
> ---
>   ui/curses.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/ui/curses.c b/ui/curses.c
> index a39aee8762..3f5c5adf78 100644
> --- a/ui/curses.c
> +++ b/ui/curses.c
> @@ -265,7 +265,12 @@ static int curses2foo(const int _curses2foo[], const int _curseskey2foo[],
>   
>   static void curses_refresh(DisplayChangeListener *dcl)
>   {
> -    int chr, keysym, keycode, keycode_alt;
> +    /*
> +     * DO NOT MAKE chr AN INT:
> +     * Causes silent conversion errors on Windows where wint_t is unsigned short.
> +     */
> +    wint_t chr = 0;
> +    int keysym, keycode, keycode_alt;
>       enum maybe_keycode maybe_keycode = CURSES_KEYCODE;
>   
>       curses_winch_check();
> @@ -284,8 +289,9 @@ static void curses_refresh(DisplayChangeListener *dcl)
>           /* while there are any pending key strokes to process */
>           chr = console_getch(&maybe_keycode);
>   
> -        if (chr == -1)
> +        if (chr == WEOF) {
>               break;
> +        }

Correct but incomplete, also missing the same check few lines below:

-- >8 --
diff --git a/ui/curses.c b/ui/curses.c
index a39aee87623..9c33de331cd 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -304,9 +304,9 @@ static void curses_refresh(DisplayChangeListener *dcl)
          /* alt or esc key */
          if (keycode == 1) {
              enum maybe_keycode next_maybe_keycode = CURSES_KEYCODE;
-            int nextchr = console_getch(&next_maybe_keycode);
+            wint_t nextchr = console_getch(&next_maybe_keycode);

-            if (nextchr != -1) {
+            if (nextchr != WEOF) {
                  chr = nextchr;
                  maybe_keycode = next_maybe_keycode;
                  keycode_alt = ALT;
---

With that:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>



  parent reply	other threads:[~2025-04-08 19:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-03  1:07 [PATCH] ui/curses: Fix infinite loop on windows William Hu via
2025-04-08 14:08 ` Stefan Hajnoczi
2025-04-08 22:28   ` Philippe Mathieu-Daudé
2025-04-08 19:01 ` Philippe Mathieu-Daudé [this message]
2025-07-21  8:35   ` [PATCH-for-10.1] " Philippe Mathieu-Daudé

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=19616b23-6b86-4f64-9836-fbfda79c76b8@linaro.org \
    --to=philmd@linaro.org \
    --cc=purplearmadillo77@proton.me \
    --cc=qemu-devel@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).