Changeset 2794

Timestamp:

Jun 24, 2009 4:00:36 PM (15 years ago)

Author:

nanang

Message:

Ticket #903: backported changes from ticket #862

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (3 diffs)
• tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py (deleted)
• tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py (copied) (copied from pjproject/trunk/tests/pjsua/scripts-sendto/300_srtp_receive_crypto_tag_zero.py)

pjproject/branches/1.0/pjmedia/src/pjmedia/transport_srtp.c

@@ -23 +23 @@
 #include <pjlib-util/base64.h>
 #include <pj/assert.h>
+#include <pj/ctype.h>
 #include <pj/lock.h>
 #include <pj/log.h>
@@ -980 +981 @@
     pj_str_t input;
     char *token;
+    int token_len;
     pj_str_t tmp;
     pj_status_t status;
@@ -993 +995 @@
         return PJMEDIA_SDP_EINATTR;
     }
+    token_len = pj_ansi_strlen(token);
+
+    /* Tag must not use leading zeroes. */
+    if (token_len > 1 && *token == '0')
+        return PJMEDIA_SDP_EINATTR;
+
+    /* Tag must be decimal, i.e: contains only digit '0'-'9'. */
+    for (itmp = 0; itmp < token_len; ++itmp)
+        if (!pj_isdigit(token[itmp]))
+            return PJMEDIA_SDP_EINATTR;
+
+    /* Get tag value. */
     *tag = atoi(token);
-    if (*tag == 0)
-        return PJMEDIA_SDP_EINATTR;
 
     /* Crypto-suite */