Changeset 5601

Timestamp:

Jun 8, 2017 4:57:59 AM (7 years ago)

Author:

nanang

Message:

Fix #2021: Crash in getting call info with long Contact header.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_uri.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua2/util.hpp (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_uri.h

@@ -295 +295 @@
  * @param buf       The buffer.
  * @param size      Size of the buffer.
- * @return          Length printed.
+ * @return          Length printed if successful, negative value if failed.
  */
 PJ_INLINE(int) pjsip_uri_print(pjsip_uri_context_e context,

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1828 +1828 @@
                                                info->local_contact.ptr,
                                                sizeof(info->buf_.local_contact));
+    if (info->local_contact.slen < 0)
+        info->local_contact.slen = 0;
 
     /* remote info */

pjproject/trunk/pjsip/src/pjsua2/util.hpp

@@ -37 +37 @@
 inline string pj2Str(const pj_str_t &input_str)
 {
-    if (input_str.ptr)
+    if (input_str.ptr && input_str.slen>0)
         return string(input_str.ptr, input_str.slen);
     return string();