From: Philippe Troin <phil+github-commits@fifi.org>
Date: Sun, 19 May 2019 04:12:48 +0000 (-0700)
Subject: Multipart boundary field can be quoted.
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~40^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=820ebcf4f8374f6e14f84098a3f7406d28f64b99;p=zchunk.git

Multipart boundary field can be quoted.

Reference: https://tools.ietf.org/html/rfc2046#section-5.1.1
According to RFC 2046, the boundary parameter in the Content-Type
header can optionally be quoted with double quotes.

Fix zchunk's boundary parsing so that double quotes are stripped when
found.
---

diff --git a/src/lib/dl/multipart.c b/src/lib/dl/multipart.c
index ca6341a..829972b 100644
--- a/src/lib/dl/multipart.c
+++ b/src/lib/dl/multipart.c
@@ -238,8 +238,16 @@ size_t multipart_get_boundary(zckDL *dl, char *b, size_t size) {
     regmatch_t match[2] = {{0}};
     if(regexec(dl->hdr_regex, buf, 2, match, 0) == 0) {
         reset_mp(dl->mp);
-        char *boundary = zmalloc(match[1].rm_eo - match[1].rm_so + 1);
-        memcpy(boundary, buf + match[1].rm_so, match[1].rm_eo - match[1].rm_so);
+	size_t boundary_length = match[1].rm_eo - match[1].rm_so;
+	char *boundary_start = buf + match[1].rm_so;
+	if ( boundary_start[0] == '\"' && boundary_length > 2
+	     && boundary_start[boundary_length-1] == '\"') {
+	    /* Remove optional quotes */
+	    boundary_start  += 1;
+	    boundary_length -= 2;
+	}
+        char *boundary = zmalloc(boundary_length + 1);
+        memcpy(boundary, boundary_start, boundary_length);
         zck_log(ZCK_LOG_DEBUG, "Multipart boundary: %s", boundary);
         dl->boundary = boundary;
     }