diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-03-13 13:54:19 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-03-13 13:54:19 -0500 |
| commit | 4b7872c9db995e99e91fc45adfd133094a51cde3 (patch) | |
| tree | b2feecc216608f39b178c0a66503a033217561f3 /res | |
| parent | a979e52c0a351b6784530be04c0b096a7428a720 (diff) | |
| parent | c711e4076a6913e18e27a694bcb3fb721822fb58 (diff) | |
Merge "core: Remove ABI effects of MALLOC_DEBUG."
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 { |