[GNUnet-SVN] [gnurl] 37/73: smtp_done: free data before returning (on send failure)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 38ab7b4ccb18f03c0323d412ff0f3613cd66f5e5
Author: Daniel Stenberg <address@hidden>
AuthorDate: Tue Oct 10 14:34:57 2017 +0200

    smtp_done: free data before returning (on send failure)
    
    ... as otherwise it could leak that memory.
    
    Detected by OSS-fuzz:
    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=3600
    
    Assisted-by: Max Dymond
    Closes #1977
---
 lib/smtp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/smtp.c b/lib/smtp.c
index de2dd3356..08d8148a3 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1188,6 +1188,9 @@ static CURLcode smtp_done(struct connectdata *conn, 
CURLcode status,
   if(!smtp || !pp->conn)
     return CURLE_OK;
 
+  /* Cleanup our per-request based variables */
+  Curl_safefree(smtp->custom);
+
   if(status) {
     connclose(conn, "SMTP done with bad status"); /* marked for closure */
     result = status;         /* use the already set error code */
@@ -1246,9 +1249,6 @@ static CURLcode smtp_done(struct connectdata *conn, 
CURLcode status,
     result = smtp_block_statemach(conn);
   }
 
-  /* Cleanup our per-request based variables */
-  Curl_safefree(smtp->custom);
-
   /* Clear the transfer mode for the next request */
   smtp->transfer = FTPTRANSFER_BODY;
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden