From: Daniel Stenberg <daniel@haxx.se>
Date: Sun, 31 Aug 2025 11:33:05 +0000 (+0200)
Subject: cw-out: add assert for data->conn
X-Git-Tag: curl-8_16_0~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5256ce229eeb91a5c1b19447c2c11723fdf016d1;p=thirdparty%2Fcurl.git

cw-out: add assert for data->conn

Instead of checking it runtime. CodeSonar pointed out that if it
actually CAN legitimately be NULL here, then we need to do more checks
for it...

Closes #18440
---

diff --git a/lib/cw-out.c b/lib/cw-out.c
index 3df1c50483..6d988a00bf 100644
--- a/lib/cw-out.c
+++ b/lib/cw-out.c
@@ -196,16 +196,17 @@ static void cw_get_writefunc(struct Curl_easy *data, cw_out_type otype,
 }
 
 static CURLcode cw_out_cb_write(struct cw_out_ctx *ctx,
-                                 struct Curl_easy *data,
-                                 curl_write_callback wcb,
-                                 void *wcb_data,
-                                 cw_out_type otype,
-                                 const char *buf, size_t blen,
-                                 size_t *pnwritten)
+                                struct Curl_easy *data,
+                                curl_write_callback wcb,
+                                void *wcb_data,
+                                cw_out_type otype,
+                                const char *buf, size_t blen,
+                                size_t *pnwritten)
 {
   size_t nwritten;
   CURLcode result;
 
+  DEBUGASSERT(data->conn);
   *pnwritten = 0;
   Curl_set_in_callback(data, TRUE);
   nwritten = wcb((char *)CURL_UNCONST(buf), 1, blen, wcb_data);
@@ -214,7 +215,7 @@ static CURLcode cw_out_cb_write(struct cw_out_ctx *ctx,
                  blen, (otype == CW_OUT_HDS) ? "header" : "body",
                  nwritten);
   if(CURL_WRITEFUNC_PAUSE == nwritten) {
-    if(data->conn && data->conn->handler->flags & PROTOPT_NONETWORK) {
+    if(data->conn->handler->flags & PROTOPT_NONETWORK) {
       /* Protocols that work without network cannot be paused. This is
          actually only FILE:// just now, and it cannot pause since the
          transfer is not done using the "normal" procedure. */