From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9Oie-00084J-GF for qemu-devel@nongnu.org; Wed, 27 May 2009 15:23:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9Oia-00083L-1P for qemu-devel@nongnu.org; Wed, 27 May 2009 15:23:20 -0400 Received: from [199.232.76.173] (port=40049 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9OiZ-00083H-PU for qemu-devel@nongnu.org; Wed, 27 May 2009 15:23:15 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:61654) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9OiY-0001wp-RS for qemu-devel@nongnu.org; Wed, 27 May 2009 15:23:15 -0400 Message-ID: <4A1D931E.9010109@weilnetz.de> Date: Wed, 27 May 2009 21:23:10 +0200 From: Stefan Weil MIME-Version: 1.0 Subject: Re: [Qemu-devel] [STABLE] [PATCH] VNC: Fix memory allocation (wrong structure size). References: <4A19AF1E.5030201@mail.berlios.de> In-Reply-To: <4A19AF1E.5030201@mail.berlios.de> Content-Type: multipart/mixed; boundary="------------040105070802050701000400" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: QEMU Developers This is a multi-part message in MIME format. --------------040105070802050701000400 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Stefan Weil schrieb: > Pointer vs addresses a VncDisplay structure, > so it is sufficient to allocate sizeof(VncDisplay) > or sizeof(*vs) bytes instead of the much larger > sizeof(VncState). > > Maybe the misleading name should be fixed, too: > the code contains many places where vs is used, > sometimes it is a VncState *, sometimes it is a > VncDisplay *. vd would be a better name. > > Signed-off-by: Stefan Weil > --- > vnc.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/vnc.c b/vnc.c > index 3f5d622..41defc2 100644 > --- a/vnc.c > +++ b/vnc.c > @@ -2033,9 +2033,8 @@ static void vnc_listen_read(void *opaque) > > void vnc_display_init(DisplayState *ds) > { > - VncDisplay *vs; > + VncDisplay *vs = qemu_mallocz(sizeof(*vs)); > > - vs = qemu_mallocz(sizeof(VncState)); > dcl = qemu_mallocz(sizeof(DisplayChangeListener)); > > ds->opaque = vs; > -- > 1.5.6.5 > > > The patch above was whitespace broken. The appended patch will work. Regards, Stefan Weil --------------040105070802050701000400 Content-Type: text/x-diff; name="0003-VNC-Fix-memory-allocation-wrong-structure-size.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0003-VNC-Fix-memory-allocation-wrong-structure-size.patch" >>From 1bcb958ac2127f96a8c3ee7fefa341f7296e48ba Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 24 May 2009 22:25:44 +0200 Subject: [PATCH] VNC: Fix memory allocation (wrong structure size). Pointer vs addresses a VncDisplay structure, so it is sufficient to allocate sizeof(VncDisplay) or sizeof(*vs) bytes instead of the much larger sizeof(VncState). Maybe the misleading name should be fixed, too: the code contains many places where vs is used, sometimes it is a VncState *, sometimes it is a VncDisplay *. vd would be a better name. Signed-off-by: Stefan Weil --- vnc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/vnc.c b/vnc.c index 3f5d622..41defc2 100644 --- a/vnc.c +++ b/vnc.c @@ -2033,9 +2033,8 @@ static void vnc_listen_read(void *opaque) void vnc_display_init(DisplayState *ds) { - VncDisplay *vs; + VncDisplay *vs = qemu_mallocz(sizeof(*vs)); - vs = qemu_mallocz(sizeof(VncState)); dcl = qemu_mallocz(sizeof(DisplayChangeListener)); ds->opaque = vs; -- 1.5.6.5 --------------040105070802050701000400--