From: Eric Blake <eblake@redhat.com>
Date: Thu, 12 May 2011 01:41:46 +0000 (-0600)
Subject: build: silence clang false positive
X-Git-Tag: CVE-2011-2178~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7647422a8c5c40c41a70323631da4217e8d6fca9;p=thirdparty%2Flibvirt.git

build: silence clang false positive

Clang couldn't quite see that the same condition of
(flags & VIR_DOMAIN_MEM_CONFIG) is used twice, such that
the second block is guaranteed that def was assigned in
the first block.

* src/libxl/libxl_driver.c (libxlDomainSetMemoryFlags): Add a hint
for clang.
---

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 1d41e2d9f9..b2cc0e8ace 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1535,6 +1535,8 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long memory,
     ret = 0;
 
     if (flags & VIR_DOMAIN_MEM_CONFIG) {
+        /* clang 2.9 needs an extra hint.  */
+        sa_assert(def);
         def->mem.cur_balloon = memory;
         ret = virDomainSaveConfig(driver->configDir, def);
     }