[Qemu-devel] [PATCH 0/2] ui: two small fixes

[Qemu-devel] [PATCH 0/2] ui: two small fixes

[arei.gonglei]

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

patch 1 reported by coverity several month ago, 
patch 2 is founded by code review.

Gonglei (2):
  ui/console: fix OVERFLOW_BEFORE_WIDEN
  vnc: avoid possible file handler leak

 ui/console.c | 4 ++--
 ui/vnc.c     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.12.4

[Qemu-devel] [PATCH 1/2] ui/console: fix OVERFLOW_BEFORE_WIDEN

[arei.gonglei]

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

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 ui/console.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/console.c b/ui/console.c
index 87af6b5..b15ca87 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1285,9 +1285,9 @@ DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,
         linesize = width * PIXMAN_FORMAT_BPP(format) / 8;
     }
 
-    size = linesize * height;
+    size = (hwaddr)linesize * height;
     data = cpu_physical_memory_map(addr, &size, 0);
-    if (size != linesize * height) {
+    if (size != (hwaddr)linesize * height) {
         cpu_physical_memory_unmap(data, size, 0, 0);
         return NULL;
     }
-- 
1.7.12.4

[Qemu-devel] [PATCH 2/2] vnc: avoid possible file handler leak

[arei.gonglei]

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

vs->lsock may equal to 0, modify the check condition,
avoid possible vs->lsock leak.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 ui/vnc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc.c b/ui/vnc.c
index 10a2724..259eca2 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3641,7 +3641,7 @@ void vnc_display_open(const char *id, Error **errp)
                 }
 
                 if (vs->lwebsock < 0) {
-                    if (vs->lsock) {
+                    if (vs->lsock != -1) {
                         close(vs->lsock);
                         vs->lsock = -1;
                     }
-- 
1.7.12.4

Re: [Qemu-devel] [PATCH 0/2] ui: two small fixes

[Gerd Hoffmann]

On Mi, 2015-03-11 at 16:20 +0800, arei.gonglei@huawei.com wrote:
> Gonglei (2):
>   ui/console: fix OVERFLOW_BEFORE_WIDEN
>   vnc: avoid possible file handler leak

added to vnc patch queue.

thanks,
  Gerd