Use common printf format when warning of buffer overflow prevention.

This commit is contained in:
Todd C. Miller
2014-03-31 15:58:24 -06:00
parent e0415632e2
commit a1240a5417
2 changed files with 7 additions and 7 deletions

View File

@@ -171,7 +171,7 @@ fill_args(const char *s, int len, int addspace)
if (addspace)
*p++ = ' ';
if (strlcpy(p, s, arg_size - (p - sudoerslval.command.args)) != (size_t)len) {
warningx(U_("fill_args: buffer overflow")); /* paranoia */
warningx(U_("internal error, %s overflow"), __func__);
sudoerserror(NULL);
debug_return_bool(false);
}

View File

@@ -159,7 +159,7 @@ get_net_ifs(char **addrinfo)
"%s%s/", cp == *addrinfo ? "" : " ",
inet_ntoa(sin->sin_addr));
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;
@@ -168,7 +168,7 @@ get_net_ifs(char **addrinfo)
len = snprintf(cp, ailen - (*addrinfo - cp),
"%s", inet_ntoa(sin->sin_addr));
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;
@@ -180,7 +180,7 @@ get_net_ifs(char **addrinfo)
len = snprintf(cp, ailen - (*addrinfo - cp),
"%s%s/", cp == *addrinfo ? "" : " ", addrbuf);
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;
@@ -189,7 +189,7 @@ get_net_ifs(char **addrinfo)
inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
len = snprintf(cp, ailen - (*addrinfo - cp), "%s", addrbuf);
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;
@@ -304,7 +304,7 @@ get_net_ifs(char **addrinfo)
"%s%s/", cp == *addrinfo ? "" : " ",
inet_ntoa(sin->sin_addr));
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;
@@ -326,7 +326,7 @@ get_net_ifs(char **addrinfo)
len = snprintf(cp, ailen - (*addrinfo - cp),
"%s", inet_ntoa(sin->sin_addr));
if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
warningx(U_("load_interfaces: overflow detected"));
warningx(U_("internal error, %s overflow"), __func__);
goto done;
}
cp += len;