Changeset 2433 for pjproject/trunk

Timestamp:

Jan 28, 2009 2:17:14 PM (16 years ago)

Author:

bennylp

Message:

Continuation of ticket #704: error in the test if PJSIP_UNESCAPE_IN_PLACE is set to 1 (thanks Michael Broughton for the report)

File:

• pjproject/trunk/pjsip/src/test-pjsip/msg_test.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

@@ -825 +825 @@
     char *hname;
     char *hshort_name;
-    char hcontent[1024];
+    char *hcontent;
     int  (*test)(pjsip_hdr*);
     unsigned flags;
@@ -1735 +1735 @@
         pjsip_hdr *parsed_hdr1=NULL, *parsed_hdr2=NULL;
         char *input, *output;
+#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
+        static char hcontent[1024];
+#else
+        char *hcontent;
+#endif
         int rc;
 
@@ -1742 +1747 @@
         hname = pj_str(test->hname);
         len = strlen(test->hcontent);
+#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
+        PJ_ASSERT_RETURN(len < sizeof(hcontent), PJSIP_EMSGTOOLONG);
+        strcpy(hcontent, test->hcontent);
+#else
+        hcontent = test->hcontent;
+#endif
+        
         parsed_hdr1 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, 
-                                                   test->hcontent, len, 
+                                                   hcontent, len, 
                                                    &parsed_len);
         if (parsed_hdr1 == NULL) {
@@ -1766 +1778 @@
             hname = pj_str(test->hshort_name);
             len = strlen(test->hcontent);
-            parsed_hdr2 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, test->hcontent, len, &parsed_len);
+#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
+            PJ_ASSERT_RETURN(len < sizeof(hcontent), PJSIP_EMSGTOOLONG);
+            strcpy(hcontent, test->hcontent);
+#else
+            hcontent = test->hcontent;
+#endif
+
+            parsed_hdr2 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, hcontent, len, &parsed_len);
             if (parsed_hdr2 == NULL) {
                 PJ_LOG(3,(THIS_FILE, "    error parsing header %s: %s", test->hshort_name, test->hcontent));