diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-11-02 18:40:20 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-11-06 11:46:06 -0600 |
| commit | 9013415593868b2d31a895e3f1f209fc21b58384 (patch) | |
| tree | 11e792bf1482ba7d8624a2f97ef30cd98ea7df58 /include | |
| parent | 0eee42626a689c7425cd21b63144943e6ada033e (diff) | |
Fix ast_(v)asprintf() malloc failure usage conditions.
When (v)asprintf() fails, the state of the allocated buffer is undefined.
The library had better not leave an allocated buffer as a result or no one
will know to free it. The most likely way it can return failure is for an
allocation failure. If the printf conversion fails then you actually have
a threading problem which is much worse because another thread modified
the parameter values.
* Made __ast_asprintf()/__ast_vasprintf() set the returned buffer to NULL
on failure. That is much more useful than either an uninitialized pointer
or a pointer that has already been freed. Many uses won't have to check
for failure to ensure that the buffer won't be double freed or prevent an
attempt to free an uninitialized pointer.
* stasis.c: Fixed memory leak in multi_object_blob_to_ami() allocated by
ast_asprintf().
* ari/resource_bridges.c:ari_bridges_play_helper(): Remove assignment to
the wrong thing which is now not needed even if assigning to the right
thing.
Change-Id: Ib5252fb8850ecf0f78ed0ee2ca0796bda7e91c23
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 4a5dbf282..03705b321 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -721,7 +721,13 @@ int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, c 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; } |