diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-11-07 07:14:15 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-07 07:14:15 -0600 |
| commit | 7ccac5e088dda8df6f06c5c127ed065ddcf0e41c (patch) | |
| tree | d6faad509385f4990246cfbf4818aa1e676ee90c /include | |
| parent | c25fd6c982461173c764411f56cc4ec9d118c469 (diff) | |
| parent | be08bb60765be338fffd33c9c1140df1ac618dbe (diff) | |
Merge "Fix ast_(v)asprintf() malloc failure usage conditions." into 15
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/utils.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 423d73b26..0a12b1d8a 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -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; } |