From: Jim Meyering <meyering@redhat.com>
Date: Wed, 7 Apr 2010 18:54:50 +0000 (+0200)
Subject: qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang
X-Git-Tag: v0.8.1~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c593aef7bc449c0120d2054532941a6bfea64d34;p=thirdparty%2Flibvirt.git

qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang

* src/util/conf.c (virConfParseValue): Add an sa_assert.
---

diff --git a/src/util/conf.c b/src/util/conf.c
index ae0459eb37..38eb163cda 100644
--- a/src/util/conf.c
+++ b/src/util/conf.c
@@ -1,7 +1,7 @@
 /**
  * conf.c: parser for a subset of the Python encoded Xen configuration files
  *
- * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
  *
  * See COPYING.LIB for the License of this software
  *
@@ -473,6 +473,13 @@ virConfParseValue(virConfParserCtxtPtr ctxt)
             SKIP_BLANKS_AND_EOL;
         }
         while ((ctxt->cur < ctxt->end) && (CUR != ']')) {
+
+            /* Tell Clang that when execution reaches this point
+               "lst" is guaranteed to be non-NULL.  This stops it
+               from issuing an invalid NULL-dereference warning about
+               "prev = lst; while (prev->next..." below.  */
+            sa_assert (lst);
+
             if (CUR != ',') {
                 virConfError(ctxt, VIR_ERR_CONF_SYNTAX,
                              _("expecting a separator in list"));