From 5cdcf1dbd39c64e18a81fc912a36942a3ec87565 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 19 Dec 2022 08:38:37 +0100 Subject: [PATCH] smb/telnet: do not free the protocol struct in *_done() It is managed by the generic layer. Reported-by: Trail of Bits Closes #10112 Upstream-commit: 4f20188ac644afe174be6005ef4f6ffba232b8b2 Signed-off-by: Kamil Dudka --- lib/smb.c | 14 ++------------ lib/telnet.c | 3 --- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/smb.c b/lib/smb.c index 039d680..f682c1f 100644 --- a/lib/smb.c +++ b/lib/smb.c @@ -61,8 +61,6 @@ static CURLcode smb_connect(struct connectdata *conn, bool *done); static CURLcode smb_connection_state(struct connectdata *conn, bool *done); static CURLcode smb_do(struct connectdata *conn, bool *done); static CURLcode smb_request_state(struct connectdata *conn, bool *done); -static CURLcode smb_done(struct connectdata *conn, CURLcode status, - bool premature); static CURLcode smb_disconnect(struct connectdata *conn, bool dead); static int smb_getsock(struct connectdata *conn, curl_socket_t *socks, int numsocks); @@ -75,7 +73,7 @@ const struct Curl_handler Curl_handler_smb = { "SMB", /* scheme */ smb_setup_connection, /* setup_connection */ smb_do, /* do_it */ - smb_done, /* done */ + ZERO_NULL, /* done */ ZERO_NULL, /* do_more */ smb_connect, /* connect_it */ smb_connection_state, /* connecting */ @@ -100,7 +98,7 @@ const struct Curl_handler Curl_handler_smbs = { "SMBS", /* scheme */ smb_setup_connection, /* setup_connection */ smb_do, /* do_it */ - smb_done, /* done */ + ZERO_NULL, /* done */ ZERO_NULL, /* do_more */ smb_connect, /* connect_it */ smb_connection_state, /* connecting */ @@ -915,14 +913,6 @@ static CURLcode smb_request_state(struct connectdata *conn, bool *done) return CURLE_OK; } -static CURLcode smb_done(struct connectdata *conn, CURLcode status, - bool premature) -{ - (void) premature; - Curl_safefree(conn->data->req.protop); - return status; -} - static CURLcode smb_disconnect(struct connectdata *conn, bool dead) { struct smb_conn *smbc = &conn->proto.smbc; diff --git a/lib/telnet.c b/lib/telnet.c index 923c7f8..48cd0d7 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -1294,9 +1294,6 @@ static CURLcode telnet_done(struct connectdata *conn, curl_slist_free_all(tn->telnet_vars); tn->telnet_vars = NULL; - - Curl_safefree(conn->data->req.protop); - return CURLE_OK; } -- 2.38.1