From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 23 Dec 2024 07:46:45 +0000 (+0100)
Subject: ngtcp2: fix two cases of value stored never read
X-Git-Tag: curl-8_12_0~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b399a98d2da10ab51afc77f7d4b83769ec4fa6fd;p=thirdparty%2Fcurl.git

ngtcp2: fix two cases of value stored never read

Detected by clang-tidy

Closes #15812
---

diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index 80b19d973b..9b2c66e705 100644
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -1521,7 +1521,7 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter *cf, struct Curl_easy *data,
 {
   struct cf_ngtcp2_ctx *ctx = cf->ctx;
   struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
-  ssize_t sent = 0;
+  ssize_t sent = -1;
   struct cf_call_data save;
   struct pkt_io_ctx pktx;
   CURLcode result;
@@ -1537,14 +1537,12 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter *cf, struct Curl_easy *data,
   result = cf_progress_ingress(cf, data, &pktx);
   if(result) {
     *err = result;
-    sent = -1;
   }
 
   if(!stream || stream->id < 0) {
     if(ctx->shutdown_started) {
       CURL_TRC_CF(data, cf, "cannot open stream on closed connection");
       *err = CURLE_SEND_ERROR;
-      sent = -1;
       goto out;
     }
     sent = h3_stream_open(cf, data, buf, len, err);
@@ -1558,7 +1556,6 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter *cf, struct Curl_easy *data,
     CURL_TRC_CF(data, cf, "[%" FMT_PRId64 "] xfer write failed", stream->id);
     cf_ngtcp2_stream_close(cf, data, stream);
     *err = stream->xfer_result;
-    sent = -1;
     goto out;
   }
   else if(stream->closed) {
@@ -1583,7 +1580,6 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter *cf, struct Curl_easy *data,
   else if(ctx->shutdown_started) {
     CURL_TRC_CF(data, cf, "cannot send on closed connection");
     *err = CURLE_SEND_ERROR;
-    sent = -1;
     goto out;
   }
   else {
@@ -1696,7 +1692,7 @@ static ssize_t read_pkt_to_send(void *userp,
   uint32_t flags;
   int64_t stream_id;
   int fin;
-  ssize_t nwritten, n;
+  ssize_t nwritten = 0, n;
   veccnt = 0;
   stream_id = -1;
   fin = 0;
@@ -1708,7 +1704,6 @@ static ssize_t read_pkt_to_send(void *userp,
    * When ngtcp2 is happy (because it has no other frame that would fit
    * or it has nothing more to send), it returns the total length
    * of the assembled packet. This may be 0 if there was nothing to send. */
-  nwritten = 0;
   *err = CURLE_OK;
   for(;;) {