From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 17 Jun 2015 23:00:25 +0000 (-0600)
Subject: Remove asprintf() return value warnings.
X-Git-Tag: SUDO_1_8_14^2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec7e467c582ef3db02d79ded6f86b104c69ad722;p=sudo

Remove asprintf() return value warnings.
---

diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 6e25201bb..ff84c6d7c 100644
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -1161,13 +1161,15 @@ done:
 static char *
 sudo_ldap_build_default_filter(void)
 {
-    char *filt = NULL;
+    char *filt;
     debug_decl(sudo_ldap_build_default_filter, SUDOERS_DEBUG_LDAP)
 
-    if (ldap_conf.search_filter)
-	(void)asprintf(&filt, "(&%s(cn=defaults))", ldap_conf.search_filter);
-    else
-	filt = strdup("cn=defaults");
+    if (!ldap_conf.search_filter)
+	debug_return_str(strdup("cn=defaults"));
+
+    if (asprintf(&filt, "(&%s(cn=defaults))", ldap_conf.search_filter) == -1)
+	debug_return_str(NULL);
+
     debug_return_str(filt);
 }
 
@@ -1686,8 +1688,9 @@ overflow:
 static char *
 sudo_ldap_build_pass2(void)
 {
-    char *filt = NULL, timebuffer[TIMEFILTER_LENGTH + 1];
+    char *filt, timebuffer[TIMEFILTER_LENGTH + 1];
     bool query_netgroups = def_use_netgroups;
+    int len;
     debug_decl(sudo_ldap_build_pass2, SUDOERS_DEBUG_LDAP)
 
     /* No need to query netgroups if using netgroup_base. */
@@ -1711,20 +1714,20 @@ sudo_ldap_build_pass2(void)
      * those get ANDed in to the expression.
      */
     if (query_netgroups && def_group_plugin) {
-	(void)asprintf(&filt, "%s%s(|(sudoUser=+*)(sudoUser=%%:*))%s%s",
+	len = asprintf(&filt, "%s%s(|(sudoUser=+*)(sudoUser=%%:*))%s%s",
 	    (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "",
 	    ldap_conf.search_filter ? ldap_conf.search_filter : "",
 	    ldap_conf.timed ? timebuffer : "",
 	    (ldap_conf.timed || ldap_conf.search_filter) ? ")" : "");
     } else {
-	(void)asprintf(&filt, "%s%s(sudoUser=*)(sudoUser=%s*)%s%s",
+	len = asprintf(&filt, "%s%s(sudoUser=*)(sudoUser=%s*)%s%s",
 	    (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "",
 	    ldap_conf.search_filter ? ldap_conf.search_filter : "",
 	    query_netgroups ? "+" : "%:",
 	    ldap_conf.timed ? timebuffer : "",
 	    (ldap_conf.timed || ldap_conf.search_filter) ? ")" : "");
     }
-    if (filt == NULL)
+    if (len == -1)
 	sudo_warnx(U_("unable to allocate memory"));
 
     debug_return_str(filt);
diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 5e4cf6847..25632dcad 100644
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -428,9 +428,10 @@ static bool
 vlog_warning(int flags, const char *fmt, va_list ap)
 {
     int oldlocale, serrno = errno;
-    char *logline, *message = NULL;
+    char *logline, *message;
     bool uid_changed, rval = true;
     va_list ap2;
+    int len;
     debug_decl(vlog_error, SUDOERS_DEBUG_LOGGING)
 
     /* Need extra copy of ap for sudo_vwarn()/sudo_vwarnx() below. */
@@ -442,12 +443,12 @@ vlog_warning(int flags, const char *fmt, va_list ap)
     /* Expand printf-style format + args (with a special case). */
     if (fmt == INCORRECT_PASSWORD_ATTEMPT) {
 	unsigned int tries = va_arg(ap, unsigned int);
-	(void)asprintf(&message, ngettext("%u incorrect password attempt",
+	len = asprintf(&message, ngettext("%u incorrect password attempt",
 	    "%u incorrect password attempts", tries), tries);
     } else {
-	(void)vasprintf(&message, _(fmt), ap);
+	len = vasprintf(&message, _(fmt), ap);
     }
-    if (message == NULL) {
+    if (len == -1) {
 	rval = false;
 	goto done;
     }