From: Vladimir Homutov <vl@nginx.com>
Date: Wed, 13 Oct 2021 11:48:33 +0000 (+0300)
Subject: QUIC: fixed removal of unused client IDs.
X-Git-Tag: release-1.25.0~4^2~213
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/postgres_fdw.c?a=commitdiff_plain;h=9ca3a02e684a3b5f19b6fec5b486d59eb4a4b319;p=nginx.git

QUIC: fixed removal of unused client IDs.

If client ID was never used, its refcount is zero.  To keep things simple,
the ngx_quic_unref_client_id() function is now aware of such IDs.

If client ID was used, the ngx_quic_replace_retired_client_id() function
is supposed to find all users and unref the ID, thus ngx_quic_unref_client_id()
should not be called after it.
---

diff --git a/src/event/quic/ngx_event_quic_connid.c b/src/event/quic/ngx_event_quic_connid.c
index 273b58c65..2ad65077a 100644
--- a/src/event/quic/ngx_event_quic_connid.c
+++ b/src/event/quic/ngx_event_quic_connid.c
@@ -183,9 +183,10 @@ retire:
             if (ngx_quic_replace_retired_client_id(c, cid) != NGX_OK) {
                 return NGX_ERROR;
             }
-        }
 
-        ngx_quic_unref_client_id(c, cid);
+        } else {
+            ngx_quic_unref_client_id(c, cid);
+        }
     }
 
 done:
@@ -534,7 +535,9 @@ ngx_quic_unref_client_id(ngx_connection_t *c, ngx_quic_client_id_t *cid)
 {
     ngx_quic_connection_t  *qc;
 
-    cid->refcnt--;
+    if (cid->refcnt) {
+        cid->refcnt--;
+    } /* else: unused client id */
 
     if (cid->refcnt) {
         return;