monitor.c: Fix infinite loop in monitor's auto-complete functionality

[Qemu-devel] [PATCH] monitor.c: Fix infinite loop in monitor's auto-complete functionality

Dimitris Karagkasidis posted 1 patch 6 years, 2 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/807b2724-7a5f-9d62-55aa-b5b3cf0c9503@gmail.com

Test checkpatch passed

Test docker-build@min-glib passed

Test docker-mingw@fedora passed

Test docker-quick@centos6 passed

Test ppcbe passed

Test ppcle passed

Test s390x passed

monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] monitor.c: Fix infinite loop in monitor's auto-complete functionality

Posted by Dimitris Karagkasidis 6 years, 2 months ago

The QEMU monitor enters an infinite loop when trying to auto-complete commands
that accept only optional parameters. The commands currently affected by this
issue are 'info registers' and 'info mtree'.

Signed-off-by: Dimitris Karagkasidis <t.pagef.lt@gmail.com>
---
 monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor.c b/monitor.c
index f4992505b1..d8b7270d9b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3741,7 +3741,7 @@ static void monitor_find_completion_by_table(Monitor *mon,
             }
         }
         str = args[nb_args - 1];
-        while (*ptype == '-' && ptype[1] != '\0') {
+        while (*ptype == '-' && ptype[2] != '\0') {
             ptype = next_arg_type(ptype);
         }
         switch(*ptype) {
-- 
2.14.1

Re: [Qemu-devel] [PATCH] monitor.c: Fix infinite loop in monitor's auto-complete functionality

Posted by Dr. David Alan Gilbert 6 years, 2 months ago

* Dimitris Karagkasidis (t.pageflt@gmail.com) wrote:
> The QEMU monitor enters an infinite loop when trying to auto-complete commands
> that accept only optional parameters. The commands currently affected by this
> issue are 'info registers' and 'info mtree'.
> 
> Signed-off-by: Dimitris Karagkasidis <t.pagef.lt@gmail.com>

Hi Dimitris,
  Thanks for that, I guess this has been broken since 48fe86f6.

Your patch does fix it, but I prefer a slightly different fix which I'll
post in a minute, which is a bit more robust to other things going
wrong.

Dave

> ---
>  monitor.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/monitor.c b/monitor.c
> index f4992505b1..d8b7270d9b 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -3741,7 +3741,7 @@ static void monitor_find_completion_by_table(Monitor *mon,
>              }
>          }
>          str = args[nb_args - 1];
> -        while (*ptype == '-' && ptype[1] != '\0') {
> +        while (*ptype == '-' && ptype[2] != '\0') {
>              ptype = next_arg_type(ptype);
>          }
>          switch(*ptype) {
> -- 
> 2.14.1
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK