Changeset 3341 for pjproject

Timestamp:

Oct 13, 2010 11:13:22 AM (14 years ago)

Author:

bennylp

Message:

Misc (Re #1134): do not allow subscription state callback to be called with NULL event parameter as application may not expect this

File:

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

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

@@ -558 +558 @@
     pjsip_evsub_state prev_state = sub->state;
     pj_str_t old_state_str = sub->state_str;
+    pjsip_event dummy_event;
 
     sub->state = state;
@@ -575 +576 @@
               (int)sub->state_str.slen,
               sub->state_str.ptr));
+
+    /* don't call the callback with NULL event, it may crash the app! */
+    if (!event) {
+        PJSIP_EVENT_INIT_USER(dummy_event, 0, 0, 0, 0);
+        event = &dummy_event;
+    }
 
     if (sub->user.on_evsub_state && sub->call_cb)