From: Roy Marples <roy@marples.name>
Date: Mon, 2 Jun 2014 23:30:50 +0000 (+0000)
Subject: Log each malloc failure because we log individual failures so we don't see
X-Git-Tag: v6.4.0~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cbfc9c3a204d4d5736fdb5a25f61571f4043b495;p=thirdparty%2Fdhcpcd.git

Log each malloc failure because we log individual failures so we don't see
any Success error messages on an invalid condition.
---

diff --git a/ipv6nd.c b/ipv6nd.c
index 0e6f7a95..43005be5 100644
--- a/ipv6nd.c
+++ b/ipv6nd.c
@@ -909,9 +909,13 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 					opt = tmp;
 					opt[l - 1] = ' ';
 					strlcpy(opt + l, ap->saddr, m);
-				}
-			} else
+				} else
+					syslog(LOG_ERR, "%s: %m", __func__);
+			} else {
 				opt = strdup(ap->saddr);
+				if (opt == NULL)
+					syslog(LOG_ERR, "%s: %m", __func__);
+			}
 			lifetime = ap->prefix_vltime;
 			break;
 
@@ -926,6 +930,8 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 			rap->mtu = mtuv;
 			snprintf(buf, sizeof(buf), "%d", mtuv);
 			opt = strdup(buf);
+			if (opt == NULL)
+				syslog(LOG_ERR, "%s: %m", __func__);
 			break;
 
 		case ND_OPT_RDNSS:
@@ -964,7 +970,8 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 					(*--tmp) = '\0';
 				else
 					*opt = '\0';
-			}
+			} else
+				syslog(LOG_ERR, "%s: %m", __func__);
 			break;
 
 		case ND_OPT_DNSSL:
@@ -990,8 +997,12 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 					if (opt)
 						print_string(opt, n,
 						    (const uint8_t *)tmp, l);
+					else
+						syslog(LOG_ERR, "%s: %m",
+						    __func__);
 					free(tmp);
-				}
+				} else
+					syslog(LOG_ERR, "%s: %m", __func__);
 			}
 			break;
 
@@ -999,10 +1010,9 @@ ipv6nd_handlera(struct ipv6_ctx *ctx, struct interface *ifp,
 			continue;
 		}
 
-		if (opt == NULL) {
-			syslog(LOG_ERR, "%s: %m", __func__);
+		if (opt == NULL)
 			continue;
-		}
+
 		TAILQ_FOREACH(rao, &rap->options, next) {
 			if (rao->type == ndo->nd_opt_type &&
 			    strcmp(rao->option, opt) == 0)