[libvirt] [PATCH] conf: Fix the problem which cause libvirtd to crash

Osier Yang jyang at redhat.com
Tue Aug 28 11:47:27 UTC 2012


* src/conf/domain_conf.c: Use STREQ_NULLABLE instead of STREQ,
as def->seclables[i]->model could be NULL.

---
I guess this doesn't fix the root cause (perhaps on XML parsing),
but this fix is sufficient anyway.
---
 src/conf/domain_conf.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c02d6f8..224aec5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14995,7 +14995,7 @@ virDomainDiskDefGetSecurityLabelDef(virDomainDiskDefPtr def, const char *model)
         return NULL;
 
     for (i = 0; i < def->nseclabels; i++) {
-        if (STREQ(def->seclabels[i]->model, model))
+        if (STREQ_NULLABLE(def->seclabels[i]->model, model))
             return def->seclabels[i];
     }
     return NULL;
-- 
1.7.7.3




More information about the libvir-list mailing list