Changeset 571 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

Jul 2, 2006 12:29:54 PM (18 years ago)

Author:

bennylp

Message:

Miscellaneous bug fix and improvements in PJMEDIA: (1) more stricker SDP parsing and validation, (2) fixed bug in RTCP attribute generation in SDP, (3) configurable telephone-event payload type

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (13 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -35 +35 @@
 };
 #define TOKEN           "-.!%*_=`'~"
+//#define TOKEN         "'`-./:?\"#$&*;=@[]^_`{|}+~!"
 #define NTP_OFFSET      ((pj_uint32_t)2208988800)
 #define THIS_FILE       "sdp.c"
@@ -67 +68 @@
 static int is_initialized;
 static pj_cis_buf_t cis_buf;
-static pj_cis_t cs_token;
+static pj_cis_t cs_digit, cs_token;
 
 static void init_sdp_parser(void)
@@ -79 +80 @@
 
     pj_cis_buf_init(&cis_buf);
+
     pj_cis_init(&cis_buf, &cs_token);
     pj_cis_add_alpha(&cs_token);
     pj_cis_add_num(&cs_token);
     pj_cis_add_str(&cs_token, TOKEN);
+
+    pj_cis_init(&cis_buf, &cs_digit);
+    pj_cis_add_num(&cs_digit);
 }
 
@@ -258 +263 @@
     /* Init */
     rtpmap->pt.slen = rtpmap->param.slen = rtpmap->enc_name.slen = 0;
+    rtpmap->clock_rate = 0;
 
     /* Parse */
@@ -283 +289 @@
 
         /* Get the clock rate. */
-        pj_scan_get(&scanner, &cs_token, &token);
+        pj_scan_get(&scanner, &cs_digit, &token);
         rtpmap->clock_rate = pj_strtoul(&token);
 
@@ -761 +767 @@
     ctx->last_error = PJMEDIA_SDP_EINVER;
 
+    /* check equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return;
+    }
+
+    /* check version is 0 */
+    if (*(scanner->curptr+2) != '0') {
+        on_scanner_error(scanner);
+        return;
+    }
+
     pj_scan_advance_n(scanner, 3, SKIP_WS);
     pj_scan_get_newline(scanner);
@@ -771 +789 @@
 
     ctx->last_error = PJMEDIA_SDP_EINORIGIN;
+
+    /* check equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return;
+    }
 
     /* o= */
@@ -811 +835 @@
     ctx->last_error = PJMEDIA_SDP_EINTIME;
 
+    /* check equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return;
+    }
+
     /* t= */
     pj_scan_advance_n(scanner, 2, SKIP_WS);
@@ -833 +863 @@
     ctx->last_error = PJMEDIA_SDP_EINSDP;
 
+    /* check equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return;
+    }
+
     /* x= */
     pj_scan_advance_n(scanner, 2, SKIP_WS);
@@ -872 +908 @@
 
     ctx->last_error = PJMEDIA_SDP_EINMEDIA;
+
+    /* check the equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return;
+    }
 
     /* m= */
@@ -926 +968 @@
 
     attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr));
+
+    /* check equal sign */
+    if (*(scanner->curptr+1) != '=') {
+        on_scanner_error(scanner);
+        return NULL;
+    }
 
     /* skip a= */
@@ -1013 +1061 @@
                     break;
                 default:
-                    parse_generic_line(&scanner, &dummy, &ctx);
+                    if (cur_name >= 'a' && cur_name <= 'z')
+                        parse_generic_line(&scanner, &dummy, &ctx);
+                    else  {
+                        ctx.last_error = PJMEDIA_SDP_EINSDP;
+                        on_scanner_error(&scanner);
+                    }
                     break;
                 }
@@ -1104 +1157 @@
 
 #define CHECK(exp,ret)  do {                    \
-                            pj_assert(exp);     \
+                            /*pj_assert(exp);*/ \
                             if (!(exp))         \
                                 return ret;     \