diff options
author | Richard Mudgett <rmudgett@digium.com> | 2018-02-19 19:55:50 -0600 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2018-03-01 13:13:55 -0600 |
commit | c711e4076a6913e18e27a694bcb3fb721822fb58 (patch) | |
tree | 57d414b30a6ac76408ea8831c071ce54ffc428d4 /res | |
parent | e58ae393b1f83981178c7ddedf4cfb40e6ca5f31 (diff) |
core: Remove ABI effects of MALLOC_DEBUG.
This allows asterisk to be compiled with MALLOC_DEBUG to load modules
built without MALLOC_DEBUG. Now pre-compiled third-party modules will
still work regardless of MALLOC_DEBUG being enabled or not.
Change-Id: Ic07ad80b2c2df894db984cf27b16a69383ce0e10
Diffstat (limited to 'res')
-rw-r--r-- | res/stasis_recording/stored.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/res/stasis_recording/stored.c b/res/stasis_recording/stored.c index ac216ff8c..909524e8f 100644 --- a/res/stasis_recording/stored.c +++ b/res/stasis_recording/stored.c @@ -123,18 +123,9 @@ static int split_path(const char *path, char **dir, char **file) return -1; } -#if defined(__AST_DEBUG_MALLOC) *dir = ast_strdup(real_dir); /* Dupe so we can ast_free() */ -#else - /* - * ast_std_free() and ast_free() are the same thing at this time - * so we don't need to dupe. - */ - *dir = real_dir; - real_dir = NULL; -#endif /* defined(__AST_DEBUG_MALLOC) */ *file = ast_strdup(file_portion); - return 0; + return (*dir && *file) ? 0 : -1; } struct match_recording_data { |