From: Jim Meyering <meyering@redhat.com>
Date: Tue, 2 Mar 2010 15:07:30 +0000 (+0100)
Subject: xend_internal.c: assure clang that we do not dereference NULL
X-Git-Tag: v0.8.1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18fa9b18bca1a27fff1e3157deb05315ad18fc8c;p=thirdparty%2Flibvirt.git

xend_internal.c: assure clang that we do not dereference NULL

* src/xen/xend_internal.c (xend_parse_sexp_desc_char): Add three
uses of sa_assert, each preceding a strchr(value,... to assure
clang that "value" is non-NULL.
---

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index c4e73b7344..950f1b5f10 100644
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -1284,6 +1284,7 @@ xend_parse_sexp_desc_char(virBufferPtr buf,
         virBufferVSprintf(buf, "      <source path='%s'/>\n",
                           value);
     } else if (STREQ(type, "tcp")) {
+        sa_assert (value);
         const char *offset = strchr(value, ':');
         const char *offset2;
         const char *mode, *protocol;
@@ -1325,6 +1326,7 @@ xend_parse_sexp_desc_char(virBufferPtr buf,
                           "      <protocol type='%s'/>\n",
                           protocol);
     } else if (STREQ(type, "udp")) {
+        sa_assert (value);
         const char *offset = strchr(value, ':');
         const char *offset2, *offset3;
 
@@ -1383,6 +1385,7 @@ xend_parse_sexp_desc_char(virBufferPtr buf,
         }
 
     } else if (STREQ(type, "unix")) {
+        sa_assert (value);
         const char *offset = strchr(value, ',');
         int dolisten = 0;
         if (offset)