From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 30 Jan 2021 16:51:00 +0000 (+0100)
Subject: hyper: fix CONNECT to set 'data' as userdata
X-Git-Tag: curl-7_75_0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c2210713e2427d567a6c44b83b3c9ac2a8577bc;p=thirdparty%2Fcurl.git

hyper: fix CONNECT to set 'data' as userdata

Follow-up to 14e075d1a7fd
---

diff --git a/lib/c-hyper.c b/lib/c-hyper.c
index cdb8e0ef35..10bd7ef9bf 100644
--- a/lib/c-hyper.c
+++ b/lib/c-hyper.c
@@ -64,7 +64,7 @@ size_t Curl_hyper_recv(void *userp, hyper_context *ctx,
   struct connectdata *conn = data->conn;
   CURLcode result;
   ssize_t nread;
-
+  DEBUGASSERT(conn);
   (void)ctx;
 
   result = Curl_read(data, conn->sockfd, (char *)buf, buflen, &nread);
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index 46261184d2..a03a27fdc4 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -681,7 +681,7 @@ static CURLcode CONNECT(struct Curl_easy *data,
         goto error;
       }
       /* tell Hyper how to read/write network data */
-      hyper_io_set_userdata(io, conn);
+      hyper_io_set_userdata(io, data);
       hyper_io_set_read(io, Curl_hyper_recv);
       hyper_io_set_write(io, Curl_hyper_send);
       conn->sockfd = tunnelsocket;