kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 04:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix ast_(v)asprintf() malloc failure usage conditions." into 15

Browse Source
This commit is contained in:
Joshua Colp
2017-11-07 07:14:15 -06:00
committed by Gerrit Code Review
parent c25fd6c982 be08bb6076
commit 7ccac5e088
9 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/utils.h
View File

@@ -622,7 +622,13 @@ int __ast_vasprintf(char **ret, const char *fmt, va_list ap, const char *file, i
DEBUG_CHAOS_RETURN(DEBUG_CHAOS_ALLOC_CHANCE, -1);
if ((res = vasprintf(ret, fmt, ap)) == -1) {
res = vasprintf(ret, fmt, ap);
if (res < 0) {
/*
* *ret is undefined so set to NULL to ensure it is
* initialized to something useful.
*/
*ret = NULL;
MALLOC_FAILURE_MSG;
}