Changeset 2822 for pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

Timestamp:

Jun 30, 2009 1:47:44 PM (15 years ago)

Author:

bennylp

Message:

Ticket #911: Crash when receiving NOTIFY after subscription is terminated (thanks Johan Lantz for the report)

• fixed the bug by not processing the NOTIFY if the subscription is already terminated
• also added SIPp scenario to reproduce the bug

File:

• pjproject/trunk/pjsip/src/pjsip-simple/evsub.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/evsub.c

@@ -1379 +1379 @@
     }
 
-    if (dlgsub == dlgsub_head) {
+    /* Note: 
+     *  the second condition is for http://trac.pjsip.org/repos/ticket/911 
+     */
+    if (dlgsub == dlgsub_head ||
+        (dlgsub->sub && 
+            pjsip_evsub_get_state(dlgsub->sub)==PJSIP_EVSUB_STATE_TERMINATED))
+    {
+        const char *reason_msg = 
+            (dlgsub == dlgsub_head ? "Subscription Does Not Exist" :
+             "Subscription already terminated");
+
         /* This could be incoming request to create new subscription */
         PJ_LOG(4,(THIS_FILE, 
-                  "Subscription not found for %.*s, event=%.*s;id=%.*s",
+                  "%s for %.*s, event=%.*s;id=%.*s",
+                  reason_msg,
                   (int)tsx->method.name.slen,
                   tsx->method.name.ptr,
@@ -1394 +1405 @@
             pjsip_method_cmp(&tsx->method, &pjsip_notify_method)==0)
         {
-            pj_str_t reason = pj_str("Subscription Does Not Exist");
+            pj_str_t reason;
             pjsip_tx_data *tdata;
             pj_status_t status;
 
+            pj_cstr(&reason, reason_msg);
             status = pjsip_dlg_create_response(dlg, 
                                                event->body.tsx_state.src.rdata,