From 9c05ddbdddb80d46a0621b519858b37d2e7c01fb Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 9 Feb 2017 17:05:01 -0700 Subject: pjproject_bundled: Update for pjproject 2.6 * Removed all 2.5.5 functional patches. * Updated usages of pj_release_pool to be "safe". * Updated configure options to disable webrtc. * Updated config_site.h to disable webrtc in pjmedia. * Added Richard Mudgett's recent resolver patches. Change-Id: Ib400cc4dfca68b3d07ce14d314e829bfddc252c7 --- res/res_pjsip_history.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'res/res_pjsip_history.c') diff --git a/res/res_pjsip_history.c b/res/res_pjsip_history.c index 651f19dea..0b50f6817 100644 --- a/res/res_pjsip_history.c +++ b/res/res_pjsip_history.c @@ -608,8 +608,13 @@ static void pjsip_history_entry_dtor(void *obj) struct pjsip_history_entry *entry = obj; if (entry->pool) { - pj_pool_release(entry->pool); + /* This mimics the behavior of pj_pool_safe_release + * which was introduced in pjproject 2.6. + */ + pj_pool_t *temp_pool = entry->pool; + entry->pool = NULL; + pj_pool_release(temp_pool); } } -- cgit v1.2.3