kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-05 02:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

...

4 Commits
2a692c9b33 ... e7f345165a

Author SHA1 Message Date
hatee
e7f345165a
Merge 0739809c7694d588656ec089b78cc9ec281d34e6 into 5e82e4f305dbf3760b6f6e3ba8fb70c3de30a6b9 2025-01-31 16:49:26 +00:00
Andrey Volk
5e82e4f305
Merge pull request from signalwire/eslleak 
[esl] 1227669 Resource leak
 2025-01-31 18:36:53 +03:00
Andrey Volk
d895fdff60 [esl] 1227669 Resource leak 2025-01-31 18:09:18 +03:00
hateeyan
0739809c76
[Core] Delete recording files if media bug creation fails 
Signed-off-by: hateeyan <hateeyan@gmail.com>
 2024-07-08 14:56:32 +08:00
2 changed files with 5 additions and 3 deletions

3
libs/esl/src/esl.c

@ -990,6 +990,8 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
} }
memcpy(&handle->sockaddr, result->ai_addr, result->ai_addrlen); memcpy(&handle->sockaddr, result->ai_addr, result->ai_addrlen);
freeaddrinfo(result);
switch(handle->sockaddr.ss_family) { switch(handle->sockaddr.ss_family) {
case AF_INET: case AF_INET:
sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr); sockaddr_in = (struct sockaddr_in*)&(handle->sockaddr);
@ -1005,7 +1007,6 @@ ESL_DECLARE(esl_status_t) esl_connect_timeout(esl_handle_t *handle, const char *
strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err)); strncpy(handle->err, "Host resolves to unsupported address family", sizeof(handle->err));
goto fail; goto fail;
} }
freeaddrinfo(result);
handle->sock = socket(handle->sockaddr.ss_family, SOCK_STREAM, IPPROTO_TCP); handle->sock = socket(handle->sockaddr.ss_family, SOCK_STREAM, IPPROTO_TCP);

5
src/switch_ivr_async.c

@ -1664,12 +1664,10 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
if (!rh->writes && !rh->vwrites && !switch_test_flag(rh->fh, SWITCH_FILE_WRITE_APPEND)) { if (!rh->writes && !rh->vwrites && !switch_test_flag(rh->fh, SWITCH_FILE_WRITE_APPEND)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding empty file %s\n", rh->file); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding empty file %s\n", rh->file);
switch_channel_set_variable(channel, "RECORD_DISCARDED", "true"); switch_channel_set_variable(channel, "RECORD_DISCARDED", "true");
switch_file_remove(rh->file, switch_core_session_get_pool(session));
set_completion_cause(rh, "empty-file"); set_completion_cause(rh, "empty-file");
} else if ((rh->fh->samples_out < rh->fh->samplerate * rh->min_sec) && !switch_test_flag(rh->fh, SWITCH_FILE_WRITE_APPEND)) { } else if ((rh->fh->samples_out < rh->fh->samplerate * rh->min_sec) && !switch_test_flag(rh->fh, SWITCH_FILE_WRITE_APPEND)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
switch_channel_set_variable(channel, "RECORD_DISCARDED", "true"); switch_channel_set_variable(channel, "RECORD_DISCARDED", "true");
switch_file_remove(rh->file, switch_core_session_get_pool(session));
set_completion_cause(rh, "input-too-short"); set_completion_cause(rh, "input-too-short");
} else { } else {
@ -2899,6 +2897,9 @@ static switch_status_t record_helper_destroy(struct record_helper **rh, switch_c
switch_core_file_close(&(*rh)->out_fh); switch_core_file_close(&(*rh)->out_fh);
} else if((*rh)->fh) { } else if((*rh)->fh) {
switch_core_file_close((*rh)->fh); switch_core_file_close((*rh)->fh);
if (((!(*rh)->writes && !(*rh)->vwrites) || ((*rh)->fh->samples_out < (*rh)->fh->samplerate * (*rh)->min_sec)) && !switch_test_flag((*rh)->fh, SWITCH_FILE_WRITE_APPEND)) {
switch_file_remove((*rh)->file, switch_core_session_get_pool(session));
}
} }
switch_event_safe_destroy((*rh)->variables); switch_event_safe_destroy((*rh)->variables);