From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Wsb-0002w5-L8 for qemu-devel@nongnu.org; Tue, 13 Mar 2012 14:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7WsY-0001pb-Bj for qemu-devel@nongnu.org; Tue, 13 Mar 2012 14:55:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32904 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7WsY-0001pV-5j for qemu-devel@nongnu.org; Tue, 13 Mar 2012 14:55:26 -0400 Message-ID: <4F5F981B.3010807@suse.de> Date: Tue, 13 Mar 2012 19:55:23 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1331663547-30041-1-git-send-email-mark.langsdorf@calxeda.com> In-Reply-To: <1331663547-30041-1-git-send-email-mark.langsdorf@calxeda.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 2/2] qdev: fix NULL deference List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Langsdorf Cc: Joshua Housh , aliguori@us.ibm.com, qemu-devel@nongnu.org, paul@codesourcery.com Am 13.03.2012 19:32, schrieb Mark Langsdorf: > From: Joshua Housh >=20 > Make sure a BusInfo exists before trying to dereference it. What's the use case that breaks? Andreas >=20 > Signed-off-by: Joshua Housh > Signed-off-by: Mark Langsdorf > --- > hw/qdev.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/qdev.c b/hw/qdev.c > index ee21d90..6c3d02f 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -86,9 +86,12 @@ void qdev_set_parent_bus(DeviceState *dev, BusState = *bus) > dev->parent_bus =3D bus; > QTAILQ_INSERT_HEAD(&bus->children, dev, sibling); > =20 > - for (prop =3D qdev_get_bus_info(dev)->props; prop && prop->name; p= rop++) { > - qdev_property_add_legacy(dev, prop, NULL); > - qdev_property_add_static(dev, prop, NULL); > + BusInfo *info =3D qdev_get_bus_info(dev); > + if (info) { > + for (prop =3D info->props; prop && prop->name; prop++) { > + qdev_property_add_legacy(dev, prop, NULL); > + qdev_property_add_static(dev, prop, NULL); > + } > } > qdev_prop_set_defaults(dev, dev->parent_bus->info->props); > } --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg