diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2023-01-02 10:10:29 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2023-01-02 13:16:24 +0100 |
| commit | ed18244df130f54290cd5729281f91fbeaf099cb (patch) | |
| tree | 96a997a3559329c70622a6ba5a93a3d91edeb09e | |
| parent | 4556665ad1a6e592eb37735e1ae153b0aa048591 (diff) | |
| download | curl-ed18244df130f54290cd5729281f91fbeaf099cb.tar.gz | |
http2: in connisdead check, attach the connection before reading
Otherwise data->conn is NULL and things go wrong.
This problem caused occastional failures in test 359, 1700 and more
depending on timing and the alignment of various planets.
Assisted-by: Stefan Eissing
Closes #10199
| -rw-r--r-- | lib/http2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/http2.c b/lib/http2.c index 3c8674cbf..95ffb0996 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2023, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -393,8 +393,10 @@ static bool http2_connisdead(struct Curl_cfilter *cf, struct Curl_easy *data) CURLcode result; ssize_t nread = -1; + Curl_attach_connection(data, cf->conn); nread = Curl_conn_cf_recv(cf->next, data, ctx->inbuf, H2_BUFSIZE, &result); + dead = FALSE; if(nread != -1) { H2BUGF(infof(data, "%d bytes stray data read before trying h2 connection", @@ -408,6 +410,7 @@ static bool http2_connisdead(struct Curl_cfilter *cf, struct Curl_easy *data) else /* the read failed so let's say this is dead anyway */ dead = TRUE; + Curl_detach_connection(data); } return dead; |