diff options
| -rw-r--r-- | apps/app_externalivr.c | 2 | ||||
| -rw-r--r-- | main/netsock2.c | 4 | ||||
| -rw-r--r-- | res/res_pjsip_acl.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_sdp_rtp.c | 4 | ||||
| -rw-r--r-- | res/res_pjsip_t38.c | 4 |
5 files changed, 12 insertions, 4 deletions
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 5649c6998..9cb8839db 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -519,6 +519,8 @@ static int app_exec(struct ast_channel *chan, const char *data) break; } + ast_free(addrs); + if (i == num_addrs) { ast_chan_log(LOG_ERROR, chan, "Could not connect to any host. ExternalIVR failed.\n"); goto exit; diff --git a/main/netsock2.c b/main/netsock2.c index 0e83f27cf..8d36805f9 100644 --- a/main/netsock2.c +++ b/main/netsock2.c @@ -287,11 +287,13 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, int e, i, res_cnt; if (!str) { + *addrs = NULL; return 0; } s = ast_strdupa(str); if (!ast_sockaddr_split_hostport(s, &host, &port, flags)) { + *addrs = NULL; return 0; } @@ -302,6 +304,7 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, if ((e = getaddrinfo(host, port, &hints, &res))) { ast_log(LOG_ERROR, "getaddrinfo(\"%s\", \"%s\", ...): %s\n", host, S_OR(port, "(null)"), gai_strerror(e)); + *addrs = NULL; return 0; } @@ -311,6 +314,7 @@ int ast_sockaddr_resolve(struct ast_sockaddr **addrs, const char *str, } if (res_cnt == 0) { + *addrs = NULL; goto cleanup; } diff --git a/res/res_pjsip_acl.c b/res/res_pjsip_acl.c index ec9f3ae27..a04f2b422 100644 --- a/res/res_pjsip_acl.c +++ b/res/res_pjsip_acl.c @@ -139,9 +139,11 @@ static int extract_contact_addr(pjsip_contact_hdr *contact, struct ast_sockaddr char host[256]; if (!contact || contact->star) { + *addrs = NULL; return 0; } if (!PJSIP_URI_SCHEME_IS_SIP(contact->uri) && !PJSIP_URI_SCHEME_IS_SIPS(contact->uri)) { + *addrs = NULL; return 0; } sip_uri = pjsip_uri_get_uri(contact->uri); diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 63a78caa8..e55e255c4 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -758,7 +758,7 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session, struct const struct pjmedia_sdp_session *sdp, const struct pjmedia_sdp_media *stream) { char host[NI_MAXHOST]; - RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free_ptr); + RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); enum ast_media_type media_type = stream_to_media_type(session_media->stream_type); enum ast_sip_session_media_encryption encryption = AST_SIP_MEDIA_ENCRYPT_NONE; int res; @@ -1115,7 +1115,7 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a const struct pjmedia_sdp_session *local, const struct pjmedia_sdp_media *local_stream, const struct pjmedia_sdp_session *remote, const struct pjmedia_sdp_media *remote_stream) { - RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free_ptr); + RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); enum ast_media_type media_type = stream_to_media_type(session_media->stream_type); char host[NI_MAXHOST]; int fdno, res; diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c index d91d370d6..029867137 100644 --- a/res/res_pjsip_t38.c +++ b/res/res_pjsip_t38.c @@ -619,7 +619,7 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session, struct { struct t38_state *state; char host[NI_MAXHOST]; - RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free_ptr); + RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); if (!session->endpoint->media.t38.enabled) { return -1; @@ -762,7 +762,7 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session, struct a const struct pjmedia_sdp_session *local, const struct pjmedia_sdp_media *local_stream, const struct pjmedia_sdp_session *remote, const struct pjmedia_sdp_media *remote_stream) { - RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free_ptr); + RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free); char host[NI_MAXHOST]; struct t38_state *state; |