diff options
author | Richard Mudgett <rmudgett@digium.com> | 2016-10-28 14:55:08 -0500 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2016-10-28 17:15:32 -0500 |
commit | 6feee22e094c6eb9df7e9682cfffe7b05dd61fce (patch) | |
tree | e9420aed99517260ae249e642c7d566aeb5c5d84 /third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch | |
parent | 2995b31d189a12e19d5a9a1df07cf9ae8ac5b39a (diff) |
bundled pjproject: Crashes while resolving DNS names.
PJPROJECT 2.5.5 introduced a race condition with the -r5349 IPv6 DNS
patch.
The patches below fix the DNS lookup race condition crash caused by
attempting to send the same message twice for the single DNS lookup.
0006-r5471-svn-backport-Various-fixes-for-DNS-IPv6.patch
0006-r5473-svn-backport-Fix-pending-query.patch
The patch below removes a cached DNS response from the hash table when
another thread is referencing the old entry. The table still contained
the entry when it was destroyed which can result in inexplicable crashes.
0006-r5475-svn-backport-Remove-DNS-cache-entry.patch
ASTERISK-26344 #close
Reported by: Ian Gilmour
ASTERISK-26387 #close
Reported by: Harley Peters
Change-Id: I17fde80359e66f65a91341ceca58d914d0f61cc4
Diffstat (limited to 'third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch')
-rw-r--r-- | third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch b/third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch new file mode 100644 index 000000000..4d11d57ef --- /dev/null +++ b/third-party/pjproject/patches/0006-r5473-svn-backport-Fix-pending-query.patch @@ -0,0 +1,28 @@ +From 509d4339747f11cfbde3a0acc447ef5d521eea93 Mon Sep 17 00:00:00 2001 +From: Richard Mudgett <rmudgett@digium.com> +Date: Fri, 28 Oct 2016 12:12:28 -0500 +Subject: [PATCH 2/3] r5473 svn backport Fix pending query + +Re #1974: +If there is a pending query, set the return value to that query (instead of NULL) + +Thanks to Richard Mudgett for the patch. +--- + pjlib-util/src/pjlib-util/resolver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c +index d24ef9d..fe687b7 100644 +--- a/pjlib-util/src/pjlib-util/resolver.c ++++ b/pjlib-util/src/pjlib-util/resolver.c +@@ -940,6 +940,7 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver, + /* Done. This child query will be notified once the "parent" + * query completes. + */ ++ p_q = nq; + status = PJ_SUCCESS; + goto on_return; + } +-- +1.7.9.5 + |