Changeset 576 for pjproject/trunk/pjsip/src/pjsip/sip_parser.c

Timestamp:

Jul 2, 2006 2:53:05 PM (18 years ago)

Author:

bennylp

Message:

Final changeset from the PROTOS testing, fixed misc. crashes. See
mailing list archive for the details

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -479 +479 @@
     rec.hname_len = strlen(name);
     if (rec.hname_len >= sizeof(rec.hname)) {
+        pj_assert(!"Header name is too long!");
         return PJ_ENAMETOOLONG;
     }
@@ -546 +547 @@
 
     if (hname->slen >= PJSIP_MAX_HNAME_LEN) {
-        pj_assert(!"Header name is too long!");
+        /* Guaranteed not to be able to find handler. */
         return NULL;
     }
@@ -832 +833 @@
             pjsip_parse_hdr_func * handler;
             pjsip_hdr *hdr = NULL;
+
+            /* Init hname just in case parsing fails.
+             * Ref: PROTOS #2412
+             */
+            hname.slen = 0;
             
             /* Get hname. */
@@ -914 +920 @@
             if (parsing_headers)
                 err_info->hname = hname;
+            else if (msg && msg->type == PJSIP_REQUEST_MSG)
+                err_info->hname = pj_str("Request Line");
+            else if (msg && msg->type == PJSIP_RESPONSE_MSG)
+                err_info->hname = pj_str("Status Line");
             else
                 err_info->hname.slen = 0;
@@ -1126 +1136 @@
                                 pj_bool_t parse_params)
 {
+    /* Bug:
+     * This function should not call back int_parse_name_addr() because
+     * it is called by that function. This would cause stack overflow
+     * with PROTOS test #1223.
     if (*scanner->curptr=='"' || *scanner->curptr=='<') {
         return (pjsip_uri*)int_parse_name_addr( scanner, pool );
     } else {
+    */
         pj_str_t scheme;
         int colon;
@@ -1148 +1163 @@
             UNREACHED({ return NULL; /* Not reached. */ })
         }
-    }
+
+    /*
+    }
+    */
 }