Skip to content

Commit 768a66c

Browse files
authored
[release/6.x] Stop passing nullptr to curl_multi_socket_action (#7371) (#7390)
1 parent 0a27801 commit 768a66c

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [6.0.16]
9+
10+
[6.0.16]: https://github.com/microsoft/CCF/releases/tag/6.0.16
11+
12+
### Fixed
13+
14+
- Stop passing nullptr to curl_multi_socket_action (#7371)
15+
816
## [6.0.15]
917

1018
[6.0.15]: https://github.com/microsoft/CCF/releases/tag/6.0.15

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "ccf"
7-
version = "6.0.15"
7+
version = "6.0.16"
88
authors = [
99
{ name="CCF Team", email="[email protected]" },
1010
]

src/http/curl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,12 +784,13 @@ namespace ccf::curl
784784
}
785785

786786
// Notify curl of the error
787+
int running_handles = 0;
787788
CHECK_CURL_MULTI(
788789
curl_multi_socket_action,
789790
self->curl_request_curlm,
790791
socket_context->socket,
791792
CURL_CSELECT_ERR,
792-
nullptr);
793+
&running_handles);
793794
self->curl_request_curlm.perform();
794795
return;
795796
}

0 commit comments

Comments
 (0)