From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 18 Oct 2013 20:55:33 +0000 (+0000)
Subject: Fix some issues detected by clang.
X-Git-Tag: v2.2b1~836
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d40cb1e4dc6c8f8deda99d9e50994b7c3eedc2f;p=thirdparty%2Fcups.git

Fix some issues detected by clang.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11343 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/scheduler/auth.c b/scheduler/auth.c
index b1dd60810a..5566e6ce65 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -458,7 +458,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I - Client connection */
 #endif /* HAVE_AUTHORIZATION_H */
 #if defined(SO_PEERCRED) && defined(AF_LOCAL)
   else if (!strncmp(authorization, "PeerCred ", 9) &&
-           con->http->hostaddr->addr.sa_family == AF_LOCAL)
+           con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best)
   {
    /*
     * Use peer credentials from domain socket connection...
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 31a8a25a00..49aabf60c9 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -645,7 +645,7 @@ cat_tar(const char *name,		/* I - PPD name */
   */
 
   if ((fp = get_file(name, request_id, "model", filename, sizeof(filename),
-                     &ppdname)) == NULL)
+                     &ppdname)) == NULL || !ppdname)
     return (1);
 
  /*