isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If asprintf() or vasprintf() fail, set the dest pointer to NULL

Browse Source 
like BSD and Solaris do.  This appears to be the direction glibc
is going as well.
This commit is contained in:
Todd C. Miller
2015-06-03 11:07:56 -06:00
parent 7a1cf7f539
commit 9884df8c9e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util/snprintf.c
View File

@@ -1566,8 +1566,12 @@ sudo_snprintf(char *str, size_t n, char const *fmt, ...)
int int
sudo_vasprintf(char **str, const char *fmt, va_list ap) sudo_vasprintf(char **str, const char *fmt, va_list ap)
{ {
int ret;
return xxxprintf(str, 0, 1, fmt, ap); ret = xxxprintf(str, 0, 1, fmt, ap);
if (ret == -1)
*str = NULL;
return ret;
} }
#endif /* !HAVE_VASPRINTF || PREFER_PORTABLE_SNPRINTF */ #endif /* !HAVE_VASPRINTF || PREFER_PORTABLE_SNPRINTF */
@@ -1581,6 +1585,8 @@ sudo_asprintf(char **str, char const *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
ret = xxxprintf(str, 0, 1, fmt, ap); ret = xxxprintf(str, 0, 1, fmt, ap);
va_end(ap); va_end(ap);
if (ret == -1)
*str = NULL;
return ret; return ret;
} }
#endif /* !HAVE_ASPRINTF || PREFER_PORTABLE_SNPRINTF */ #endif /* !HAVE_ASPRINTF || PREFER_PORTABLE_SNPRINTF */