Changeset 5397

Timestamp:

Jul 26, 2016 2:58:44 AM (8 years ago)

Author:

nanang

Message:

Misc (re #1945): Updated array limit checks and docs in pjsip_evsub_register_pkg() and pjsip_endpt_add_capability(). Thanks Alexei Gradinari for the patch.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-simple/evsub.h (modified) (1 diff)
• include/pjsip/sip_endpoint.h (modified) (1 diff)
• src/pjsip-simple/evsub.c (modified) (1 diff)
• src/pjsip/sip_endpoint.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-simple/evsub.h

@@ -247 +247 @@
  * @param event_name    Event package identification.
  * @param expires       Default subscription expiration time, in seconds.
- * @param accept_cnt    Number of strings in Accept array.
+ * @param accept_cnt    Number of strings in Accept array. The value must
+ *                      not be greater than PJSIP_GENERIC_ARRAY_MAX_COUNT.
  * @param accept        Array of Accept value.
  *

pjproject/trunk/pjsip/include/pjsip/sip_endpoint.h

@@ -584 +584 @@
  *                  must be supplied in this argument. Otherwise the value
  *                  must be set to NULL.
- * @param count     The number of tags in the array.
+ * @param count     The number of tags in the array. The value must not
+ *                  be greater than PJSIP_GENERIC_ARRAY_MAX_COUNT.
  * @param tags      Array of tags describing the capabilities or extensions
  *                  to be added to the appropriate header.

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

@@ -413 +413 @@
 
     PJ_ASSERT_RETURN(pkg_mod && event_name, PJ_EINVAL);
-    PJ_ASSERT_RETURN(accept_cnt < PJ_ARRAY_SIZE(pkg->pkg_accept->values), 
+    
+    /* Make sure accept_cnt < PJ_ARRAY_SIZE(pkg->pkg_accept->values) */
+    PJ_ASSERT_RETURN(accept_cnt <= PJSIP_GENERIC_ARRAY_MAX_COUNT, 
                      PJ_ETOOMANY);
 

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -372 +372 @@
     /* Check arguments. */
     PJ_ASSERT_RETURN(endpt!=NULL && count>0 && tags, PJ_EINVAL);
+    PJ_ASSERT_RETURN(count <= PJSIP_GENERIC_ARRAY_MAX_COUNT, PJ_ETOOMANY);
     PJ_ASSERT_RETURN(htype==PJSIP_H_ACCEPT || 
                      htype==PJSIP_H_ALLOW ||