From 1d570a82d8373a6e7501be6583b5ee5052e05a2a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Tue, 13 Jun 2023 16:18:00 +0200
Subject: [PATCH] Fix CVE-2022-43552

Merge: curl/curl@4f20188ac644afe17
---
 r5dev/thirdparty/curl/smb.c    | 17 ++---------------
 r5dev/thirdparty/curl/telnet.c |  3 ---
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/r5dev/thirdparty/curl/smb.c b/r5dev/thirdparty/curl/smb.c
index 51b3434c..bddbf4a5 100644
--- a/r5dev/thirdparty/curl/smb.c
+++ b/r5dev/thirdparty/curl/smb.c
@@ -74,7 +74,7 @@ const struct Curl_handler Curl_handler_smb = {
   "SMB",                                /* scheme */
   smb_setup_connection,                 /* setup_connection */
   ZERO_NULL,                            /* do_it */
-  smb_done,                             /* done */
+  ZERO_NULL,                            /* done */
   ZERO_NULL,                            /* do_more */
   smb_connect,                          /* connect_it */
   smb_connection_state,                 /* connecting */
@@ -98,7 +98,7 @@ const struct Curl_handler Curl_handler_smbs = {
   "SMBS",                               /* scheme */
   smb_setup_connection,                 /* setup_connection */
   ZERO_NULL,                            /* do_it */
-  smb_done,                             /* done */
+  ZERO_NULL,                            /* done */
   ZERO_NULL,                            /* do_more */
   smb_connect,                          /* connect_it */
   smb_connection_state,                 /* connecting */
@@ -884,19 +884,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)
-{
-  struct smb_request *req = conn->data->req.protop;
-
-  (void) premature;
-
-  Curl_safefree(req->share);
-  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/r5dev/thirdparty/curl/telnet.c b/r5dev/thirdparty/curl/telnet.c
index 8131804e..1d5c720a 100644
--- a/r5dev/thirdparty/curl/telnet.c
+++ b/r5dev/thirdparty/curl/telnet.c
@@ -1275,9 +1275,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;
 }