[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 2/2] xenParseXM: don't dereference NULL pointer when script is empty



On Thu, Oct 06, 2011 at 11:56:29AM +0200, Michal Privoznik wrote:
> On 06.10.2011 11:16, Guido Günther wrote:
> > O.k. to apply?
> >  -- Guido
> > 
> > ---
> >  src/xenxs/xen_xm.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
> > index d057043..30188e2 100644
> > --- a/src/xenxs/xen_xm.c
> > +++ b/src/xenxs/xen_xm.c
> > @@ -697,8 +697,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
> >                  }
> >              }
> >  
> > -            if (bridge[0] || STREQ(script, "vif-bridge") ||
> > -                STREQ(script, "vif-vnic")) {
> > +            if (bridge[0] || (script && (STREQ(script, "vif-bridge") ||
> 
> I'd rather use STREQ_NULLABLE here.

In fact I was looking for that kind of function in hacking.html. New
patch attached.
Cheers,
 -- Guido
>From 1819f18fbbf0c133a66c93debc117456e940b2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx sigxcpu org>
Date: Thu, 6 Oct 2011 12:56:52 +0200
Subject: [PATCH] xenParseXM: don't dereference NULL pointer when script is
 empty

---
 src/xenxs/xen_xm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index d057043..6113f33 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -697,8 +697,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
                 }
             }
 
-            if (bridge[0] || STREQ(script, "vif-bridge") ||
-                STREQ(script, "vif-vnic")) {
+            if (bridge[0] || STREQ_NULLABLE(script, "vif-bridge") ||
+                STREQ_NULLABLE(script, "vif-vnic")) {
                 net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
             } else {
                 net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
@@ -715,7 +715,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
                     !(net->data.bridge.ipaddr = strdup(ip)))
                     goto no_memory;
             } else {
-                if (script[0] &&
+                if (script && script[0] &&
                     !(net->data.ethernet.script = strdup(script)))
                     goto no_memory;
                 if (ip[0] &&
-- 
1.7.6.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]