Merge "chan_sip.c: Made sip_reinvite_retry() call sip_pvt_lock_full()."

diff --cc channels/chan_sip.c
index 5c6f23fedbb698b602cc9cc71292c9fe99cdf269,13fe7cef1d677644be9d217a34d6c6e2ab5f6772..97cd6abb05e410081097265c606572cc908e040a
--- 1/channels/chan_sip.c
--- 2/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@@ -23290,19 -22896,9 +23285,20 @@@ static int sip_reinvite_retry(const voi
        sip_pvt_unlock(p);
        if (owner) {
                ast_channel_unlock(owner);
+               ast_channel_unref(owner);
        }
 -      dialog_unref(p, "unref the dialog ptr from sip_reinvite_retry, because it held a dialog ptr");
 +      dialog_unref(p, "Schedule waitid complete");
 +      return 0;
 +}
 +
 +/* Run by the sched thread. */
 +static int __stop_reinvite_retry(const void *data)
 +{
 +      struct sip_pvt *pvt = (void *) data;
 +
 +      AST_SCHED_DEL_UNREF(sched, pvt->waitid,
 +              dialog_unref(pvt, "Stop scheduled waitid"));
 +      dialog_unref(pvt, "Stop reinvite retry action");
        return 0;
  }