Changeset 3545

Timestamp:

Apr 27, 2011 3:05:26 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1247: Deadlock potential in sip_regc.c if sending fails (thank you Alejandro Orellana for the report)

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -992 +992 @@
 }
 
-static void tsx_callback(void *token, pjsip_event *event)
+static void regc_tsx_callback(void *token, pjsip_event *event)
 {
     pj_status_t status;
@@ -1252 +1252 @@
     pjsip_tx_data_add_ref(tdata);
 
+    /* Need to unlock the regc temporarily while sending the message to
+     * prevent deadlock (https://trac.pjsip.org/repos/ticket/1247).
+     * It should be safe to do this since the regc's refcount has been
+     * incremented.
+     */
+    pj_lock_release(regc->lock);
+
+    /* Now send the message */
     status = pjsip_endpt_send_request(regc->endpt, tdata, REGC_TSX_TIMEOUT,
-                                      regc, &tsx_callback);
+                                      regc, &regc_tsx_callback);
     if (status!=PJ_SUCCESS) {
         PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
     }
+
+    /* Reacquire the lock */
+    pj_lock_acquire(regc->lock);
 
     /* Get last transport used and add reference to it */