From 0d40cb1e4dc6c8f8deda99d9e50994b7c3eedc2f Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 18 Oct 2013 20:55:33 +0000 Subject: [PATCH] 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 --- scheduler/auth.c | 2 +- scheduler/cups-driverd.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scheduler/auth.c b/scheduler/auth.c index b1dd60810..5566e6ce6 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 31a8a25a0..49aabf60c 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); /* -- 2.39.5