File curl-CVE-2022-43552.patch of Package curl.33127

Overview Repositories Revisions Requests Users Attributes Meta

File curl-CVE-2022-43552.patch of Package curl.33127

From f3b4c5edf97c157a8ad3727827d1ac94062cfff8 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 7 Nov 2022 17:09:48 +0100
Subject: [PATCH] smb/telnet: do not free the protocol struct in *_done()

It is managed by the generic layer.
---
 lib/smb.c    | 14 ++------------
 lib/telnet.c |  3 ---
 2 files changed, 2 insertions(+), 15 deletions(-)

Index: curl-7.66.0/lib/smb.c
===================================================================
--- curl-7.66.0.orig/lib/smb.c
+++ curl-7.66.0/lib/smb.c
@@ -61,8 +61,6 @@ static CURLcode smb_connect(struct conne
 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);
 static CURLcode smb_parse_url_path(struct connectdata *conn);
@@ -74,7 +72,7 @@ const struct Curl_handler Curl_handler_s
   "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 */
@@ -99,7 +97,7 @@ const struct Curl_handler Curl_handler_s
   "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 */
@@ -918,14 +916,6 @@ static CURLcode smb_request_state(struct
   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;
Index: curl-7.66.0/lib/telnet.c
===================================================================
--- curl-7.66.0.orig/lib/telnet.c
+++ curl-7.66.0/lib/telnet.c
@@ -1295,8 +1295,6 @@ static CURLcode telnet_done(struct conne
   curl_slist_free_all(tn->telnet_vars);
   tn->telnet_vars = NULL;
 
-  Curl_safefree(conn->data->req.protop);
-
   return CURLE_OK;
 }

Places

File curl-CVE-2022-43552.patch of Package curl.33127

Places