Unverified Commit 179927c1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

mime: put the boundary buffer into the curl_mime struct 

... instead of allocating it separately and point to it. It is
fixed-size and always used for each part.

Closes #3561
parent 84c10dc1

lib/mime.c

+2 −12
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -1122,8 +1122,6 @@ void curl_mime_free(curl_mime *mime) 
      Curl_mime_cleanpart(part);

      free(part);

    }



    free(mime->boundary);

    free(mime);

  }

}
@@ -1220,18 +1218,10 @@ curl_mime *curl_mime_init(struct Curl_easy *easy) 
    mime->firstpart = NULL;

    mime->lastpart = NULL;



    /* Get a part boundary. */

    mime->boundary = malloc(24 + MIME_RAND_BOUNDARY_CHARS + 1);

    if(!mime->boundary) {

      free(mime);

      return NULL;

    }



    memset(mime->boundary, '-', 24);

    if(Curl_rand_hex(easy, (unsigned char *) mime->boundary + 24,

    if(Curl_rand_hex(easy, (unsigned char *) &mime->boundary[24],

                     MIME_RAND_BOUNDARY_CHARS + 1)) {

      /* failed to get random separator, bail out */

      free(mime->boundary);

      free(mime);

      return NULL;

    }

lib/mime.h

+5 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -88,13 +88,16 @@ typedef struct { 
  size_t offset;              /* State-dependent offset. */

}  mime_state;



/* mimimum buffer size for the boundary string */

#define MIME_BOUNDARY_LEN (24 + MIME_RAND_BOUNDARY_CHARS + 1)



/* A mime multipart. */

struct curl_mime_s {

  struct Curl_easy *easy;          /* The associated easy handle. */

  curl_mimepart *parent;           /* Parent part. */

  curl_mimepart *firstpart;        /* First part. */

  curl_mimepart *lastpart;         /* Last part. */

  char *boundary;                  /* The part boundary. */

  char boundary[MIME_BOUNDARY_LEN]; /* The part boundary. */

  mime_state state;                /* Current readback state. */

};