summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Campen <docfaraday@gmail.com>2019-10-24 10:28:26 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-10-24 22:41:56 +0200
commit3cf5b668739016ef642b15a2c89197225dca113a (patch)
treece5cfa7678c2c0531877d494d268fd732a9ce24c
parent2acc0caa7a88723b3d778e6e8d5aa0910bdf1a37 (diff)
downloadUXP-3cf5b668739016ef642b15a2c89197225dca113a.tar
UXP-3cf5b668739016ef642b15a2c89197225dca113a.tar.gz
UXP-3cf5b668739016ef642b15a2c89197225dca113a.tar.lz
UXP-3cf5b668739016ef642b15a2c89197225dca113a.tar.xz
UXP-3cf5b668739016ef642b15a2c89197225dca113a.zip
Prevent nr_ice_component_insert_pair from leaking.
-rw-r--r--media/mtransport/third_party/nICEr/src/ice/ice_component.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/mtransport/third_party/nICEr/src/ice/ice_component.c b/media/mtransport/third_party/nICEr/src/ice/ice_component.c
index 2be25efca..11b4fcbc1 100644
--- a/media/mtransport/third_party/nICEr/src/ice/ice_component.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_component.c
@@ -909,7 +909,6 @@ static int nr_ice_component_process_incoming_check(nr_ice_component *comp, nr_tr
nr_ice_candidate_pair_set_state(pair->pctx,pair,NR_ICE_PAIR_STATE_FROZEN);
if(r=nr_ice_component_insert_pair(comp,pair)) {
*error=(r==R_NO_MEMORY)?500:400;
- nr_ice_candidate_pair_destroy(&pair);
ABORT(r);
}
@@ -1615,6 +1614,7 @@ int nr_ice_component_finalize(nr_ice_component *lcomp, nr_ice_component *rcomp)
int nr_ice_component_insert_pair(nr_ice_component *pcomp, nr_ice_cand_pair *pair)
{
int r,_status;
+ int pair_inserted=0;
/* Pairs for peer reflexive are marked SUCCEEDED immediately */
if (pair->state != NR_ICE_PAIR_STATE_FROZEN &&
@@ -1626,6 +1626,8 @@ int nr_ice_component_insert_pair(nr_ice_component *pcomp, nr_ice_cand_pair *pair
if(r=nr_ice_candidate_pair_insert(&pair->remote->stream->check_list,pair))
ABORT(r);
+ pair_inserted=1;
+
/* Make sure the check timer is running, if the stream was previously
* started. We will not start streams just because a pair was created,
* unless it is the first pair to be created across all streams. */
@@ -1642,6 +1644,9 @@ int nr_ice_component_insert_pair(nr_ice_component *pcomp, nr_ice_cand_pair *pair
_status=0;
abort:
+ if (_status && !pair_inserted) {
+ nr_ice_candidate_pair_destroy(&pair);
+ }
return(_status);
}