[Qemu-devel] [PATCH] vnc: fix segmentation fault when invalid vnc parameters are specified

[Qemu-devel] [PATCH] vnc: fix segmentation fault when invalid vnc parameters are specified

[arei.gonglei]

From: Gonglei <arei.gonglei@huawei.com>

Reproducer:
 #./qemu-system-x86_64 -vnc :0,ip
qemu-system-x86_64: -vnc :1,ip: Invalid parameter 'ip'
Segmentation fault (core dumped)

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 This patch bases on Gerd's vnc queue.
---
 ui/vnc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 4b6ef1e..59b3aff 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3698,8 +3698,13 @@ QemuOpts *vnc_parse_func(const char *str)
 {
     QemuOptsList *olist = qemu_find_opts("vnc");
     QemuOpts *opts = qemu_opts_parse(olist, str, 1);
-    const char *id = qemu_opts_id(opts);
+    const char *id = NULL;
 
+    if (!opts) {
+        return NULL;
+    }
+
+    id = qemu_opts_id(opts);
     if (!id) {
         /* auto-assign id if not present */
         vnc_auto_assign_id(olist, opts);
-- 
1.7.12.4

Re: [Qemu-devel] [PATCH] vnc: fix segmentation fault when invalid vnc parameters are specified

[Michael Tokarev]

12.03.2015 06:59, arei.gonglei@huawei.com wrote:
> +++ b/ui/vnc.c
> @@ -3698,8 +3698,13 @@ QemuOpts *vnc_parse_func(const char *str)
>  {
>      QemuOptsList *olist = qemu_find_opts("vnc");
>      QemuOpts *opts = qemu_opts_parse(olist, str, 1);
> -    const char *id = qemu_opts_id(opts);
> +    const char *id = NULL;

Useless initializer.

/mjt

> +    if (!opts) {
> +        return NULL;
> +    }
> +
> +    id = qemu_opts_id(opts);

Re: [Qemu-devel] [PATCH] vnc: fix segmentation fault when invalid vnc parameters are specified

[Gonglei]

On 2015/3/12 15:07, Michael Tokarev wrote:
> 12.03.2015 06:59, arei.gonglei@huawei.com wrote:
>> +++ b/ui/vnc.c
>> @@ -3698,8 +3698,13 @@ QemuOpts *vnc_parse_func(const char *str)
>>  {
>>      QemuOptsList *olist = qemu_find_opts("vnc");
>>      QemuOpts *opts = qemu_opts_parse(olist, str, 1);
>> -    const char *id = qemu_opts_id(opts);
>> +    const char *id = NULL;
> 
> Useless initializer.
> 
Okay, will fix, thanks.

Regards,
-Gonglei
> /mjt
> 
>> +    if (!opts) {
>> +        return NULL;
>> +    }
>> +
>> +    id = qemu_opts_id(opts);
>