mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
app_confbridge: Make sure name recordings are always removed from the filesystem
This commit fixes two possible scenarios: * When recording name and if during recording you hangup, file is never removed. This is due to the fact file location is nulled. * When recording name and if you hangup during thank-you prompt, file is never removed. ASTERISK-27123 #close Change-Id: I39b7271408b4b54ce880c5111a886aa8f28c2625
This commit is contained in:
@@ -2137,6 +2137,7 @@ static int conf_rec_name(struct confbridge_user *user, const char *conf_name)
|
||||
}
|
||||
|
||||
if (res == -1) {
|
||||
ast_filedelete(user->name_rec_location, NULL);
|
||||
user->name_rec_location[0] = '\0';
|
||||
return -1;
|
||||
}
|
||||
@@ -2228,6 +2229,7 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
|
||||
{
|
||||
int res = 0, volume_adjustments[2];
|
||||
int quiet = 0;
|
||||
int async_delete_task_pushed = 0;
|
||||
char *parse;
|
||||
const char *b_profile_name = NULL;
|
||||
const char *u_profile_name = NULL;
|
||||
@@ -2473,6 +2475,7 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
|
||||
async_play_sound_file(conference,
|
||||
conf_get_sound(CONF_SOUND_HAS_LEFT, conference->b_profile.sounds), NULL);
|
||||
async_delete_name_rec(conference, user.name_rec_location);
|
||||
async_delete_task_pushed = 1;
|
||||
}
|
||||
|
||||
/* play the leave sound */
|
||||
@@ -2501,6 +2504,9 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
|
||||
}
|
||||
|
||||
confbridge_cleanup:
|
||||
if (!async_delete_task_pushed && !ast_strlen_zero(user.name_rec_location)) {
|
||||
ast_filedelete(user.name_rec_location, NULL);
|
||||
}
|
||||
ast_bridge_features_cleanup(&user.features);
|
||||
conf_bridge_profile_destroy(&user.b_profile);
|
||||
return res;
|
||||
|
Reference in New Issue
Block a user