Changeset 5669 for pjproject

Timestamp:

Oct 3, 2017 9:35:36 AM (7 years ago)

Author:

riza

Message:

Close #2049: Try to allocate larger buffer size when converting pjsip_hdr to
SipHeader?.

File:

• pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsua2/siptypes.cpp

@@ -364 +364 @@
 void SipHeader::fromPj(const pjsip_hdr *hdr) throw(Error)
 {
-    char buf[256];
-
-    int len = pjsip_hdr_print_on((void*)hdr, buf, sizeof(buf)-1);
-    if (len <= 0)
+    char *buf = NULL;
+    int len = 0;
+    unsigned buf_size = 256>>1;
+
+    /* Print header to a 256 bytes buffer first.
+     * If buffer is not sufficient, try 512, 1024, soon
+     * until > PJSIP_MAX_PKT_LEN
+     */
+    do {
+        buf_size <<= 1;
+        buf = (char*)malloc(buf_size);
+        if (!buf)
+            PJSUA2_RAISE_ERROR(PJ_ENOMEM);
+
+        len = pjsip_hdr_print_on((void*)hdr, buf, buf_size-1);
+        if (len < 0)
+            free(buf);
+
+    } while ((buf_size < PJSIP_MAX_PKT_LEN) && (len < 0));
+    
+    if (len < 0)
         PJSUA2_RAISE_ERROR(PJ_ETOOSMALL);
+
     buf[len] = '\0';
 
     char *pos = strchr(buf, ':');
-    if (!pos)
+    if (!pos) {
+        free(buf);
         PJSUA2_RAISE_ERROR(PJSIP_EINVALIDHDR);
+    }
 
     // Trim white space after header name
@@ -385 +405 @@
     hName = string(buf, end_name);
     hValue = string(start_val);
+    free(buf);
 }