diff options
| -rw-r--r-- | apps/app_festival.c | 2 | ||||
| -rw-r--r-- | doc/api-1.6.0-changes.odt | bin | 44151 -> 0 bytes | |||
| -rw-r--r-- | doc/api-1.6.2-changes.txt | 6 | ||||
| -rw-r--r-- | main/asterisk.c | 4 | ||||
| -rw-r--r-- | main/bridge.c | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/apps/app_festival.c b/apps/app_festival.c index 7df8caf8a..117bc1aeb 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -405,6 +405,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) if (serverhost == NULL) { ast_log(LOG_WARNING, "festival_client: gethostbyname failed\n"); ast_config_destroy(cfg); + close(fd); return -1; } memmove(&serv_addr.sin_addr, serverhost->h_addr, serverhost->h_length); @@ -416,6 +417,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) { ast_log(LOG_WARNING, "festival_client: connect to server failed\n"); ast_config_destroy(cfg); + close(fd); return -1; } diff --git a/doc/api-1.6.0-changes.odt b/doc/api-1.6.0-changes.odt Binary files differdeleted file mode 100644 index 0f37a33cb..000000000 --- a/doc/api-1.6.0-changes.odt +++ /dev/null diff --git a/doc/api-1.6.2-changes.txt b/doc/api-1.6.2-changes.txt deleted file mode 100644 index 34a3e5fc0..000000000 --- a/doc/api-1.6.2-changes.txt +++ /dev/null @@ -1,6 +0,0 @@ -PBX changes ------------ - * If you use ast_build_timing() in your application, you should start calling - ast_destroy_timing() upon destruction of the structure, to avoid a memory - leak. - diff --git a/main/asterisk.c b/main/asterisk.c index f8e31d5a0..01107e217 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -795,7 +795,9 @@ static int swapmode(int *used, int *total) static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { uint64_t physmem, freeram; +#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL) uint64_t freeswap = 0; +#endif int nprocs = 0; long uptime = 0; int totalswap = 0; @@ -885,7 +887,7 @@ static char *handle_show_sysinfo(struct ast_cli_entry *e, int cmd, struct ast_cl #if defined(HAVE_SYSINFO) ast_cli(a->fd, " Buffer RAM: %" PRIu64 " KiB\n", ((uint64_t) sys_info.bufferram * sys_info.mem_unit) / 1024); #endif -#if defined(HAVE_SWAPCTL) || defined(HAVE_SYSINFO) +#if defined(HAVE_SYSINFO) || defined(HAVE_SWAPCTL) ast_cli(a->fd, " Total Swap Space: %d KiB\n", totalswap); ast_cli(a->fd, " Free Swap Space: %" PRIu64 " KiB\n\n", freeswap); #endif diff --git a/main/bridge.c b/main/bridge.c index 5e065fb35..8284fd3af 100644 --- a/main/bridge.c +++ b/main/bridge.c @@ -3808,7 +3808,7 @@ void ast_bridge_update_talker_src_video_mode(struct ast_bridge *bridge, struct a data->average_talking_energy = talker_energy; } else if ((data->average_talking_energy < talker_energy) && is_keyframe) { if (data->chan_old_vsrc) { - ast_channel_unref(data->chan_old_vsrc); + data->chan_old_vsrc = ast_channel_unref(data->chan_old_vsrc); } if (data->chan_vsrc) { data->chan_old_vsrc = data->chan_vsrc; |