Changeset 5594

Timestamp:

May 22, 2017 3:53:35 AM (7 years ago)

Author:

ming

Message:

Fixed #2017: Incorrect parsing of zero length multipart body parts

File:

• pjproject/trunk/pjsip/src/pjsip/sip_multipart.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_multipart.c

@@ -654 +654 @@
         end_body = curptr;
 
-        /* The newline preceeding the delimiter is conceptually part of
-         * the delimiter, so trim it from the body.
+        /* Note that when body is empty, end_body will be equal
+         * to start_body.
          */
-        if (*(end_body-1) == '\n')
-            --end_body;
-        if (*(end_body-1) == '\r')
-            --end_body;
+        if (end_body > start_body) {
+            /* The newline preceeding the delimiter is conceptually part of
+             * the delimiter, so trim it from the body.
+             */
+            if (*(end_body-1) == '\n')
+                --end_body;
+            if (*(end_body-1) == '\r')
+                --end_body;
+        }
 
         /* Now that we have determined the part's boundary, parse it