Changeset 3003 for pjproject/trunk

Timestamp:

Nov 10, 2009 5:09:44 AM (15 years ago)

Author:

bennylp

Message:

More ticket #940: Multiple header rows with the same name may not be completely processed by PJSIP modules:

• handle the case when context doesn't have rdata (such as when parsing individual header or in pjsip-test), which crashed the app

File:

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

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

@@ -1933 +1933 @@
 {
     pjsip_require_hdr *hdr;
-    pj_bool_t new_hdr = (ctx->rdata->msg_info.require == NULL);
+    pj_bool_t new_hdr = (ctx->rdata==NULL ||
+                         ctx->rdata->msg_info.require == NULL);
     
     if (ctx->rdata && ctx->rdata->msg_info.require) {
@@ -1939 +1940 @@
     } else {
         hdr = pjsip_require_hdr_create(ctx->pool);
-        ctx->rdata->msg_info.require = hdr;
+        if (ctx->rdata)
+            ctx->rdata->msg_info.require = hdr;
     }
 
@@ -1982 +1984 @@
 {
     pjsip_supported_hdr *hdr;
-    pj_bool_t new_hdr = (ctx->rdata->msg_info.supported == NULL);
+    pj_bool_t new_hdr = (ctx->rdata==NULL || 
+                         ctx->rdata->msg_info.supported == NULL);
 
     if (ctx->rdata && ctx->rdata->msg_info.supported) {
@@ -1988 +1991 @@
     } else {
         hdr = pjsip_supported_hdr_create(ctx->pool);
-        ctx->rdata->msg_info.supported = hdr;
+        if (ctx->rdata)
+            ctx->rdata->msg_info.supported = hdr;
     }