Skip to content

Commit 04227b2

Browse files
nodejs-github-bottargos
authored andcommitted
deps: update c-ares to 1.20.1
PR-URL: #50082 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 13e69ee commit 04227b2

File tree

10 files changed

+85
-61
lines changed

10 files changed

+85
-61
lines changed

deps/cares/CHANGES

+40-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
Changelog for the c-ares project. Generated with git2changes.pl
22

3+
Version 1.20.1 (8 Oct 2023)
4+
5+
GitHub (8 Oct 2023)
6+
- [Daniel Stenberg brought this change]
7+
8+
ares-test: silence warning (#564)
9+
10+
warning: comparison of integer expressions of different signedness
11+
12+
Fix By: Daniel Stenberg (@bagder)
13+
14+
Brad House (8 Oct 2023)
15+
- fix README.md
16+
17+
GitHub (8 Oct 2023)
18+
- [Brad House brought this change]
19+
20+
1.20.1 release (#563)
21+
22+
- [Brad House brought this change]
23+
24+
fix reference to freed memory (#562)
25+
26+
Issue #561 shows free'd memory could be accessed in some error conditions.
27+
28+
Fixes Issue #561
29+
Fix By: Brad House (@bradh352)
30+
31+
Brad House (8 Oct 2023)
32+
- reported build/test systems may timeout on intensive tests. reduce test case to still be relevant but to reduce false positive errors
33+
34+
GitHub (8 Oct 2023)
35+
- [Gregor Jasny brought this change]
36+
37+
Regression: Fix typo in fuzzcheck target name (#559)
38+
39+
This seems to be a vim'esque typo introduced with c1b00c41.
40+
41+
Fix By: Gregor Jasny (@gjasny)
42+
343
Version 1.20.0 (6 Oct 2023)
444

545
Brad House (6 Oct 2023)
@@ -5665,32 +5705,3 @@ Ben Greear (30 Jul 2010)
56655705
- ipv6: Fix some build issues related to the local-bind feature.
56665706

56675707
Signed-off-by: Ben Greear <greearb@candelatech.com>
5668-
5669-
Guenter Knauf (29 Jul 2010)
5670-
- Replaced uint32_t with unsigned int to fix broken builds on a couple of platforms.
5671-
5672-
Daniel Stenberg (18 Jul 2010)
5673-
- [Ben Greear brought this change]
5674-
5675-
local-bind: Support binding to local interface/IPs
5676-
5677-
Add 3 new functions to set the local binding for the out-going
5678-
socket connection, and add ares_set_servers_csv() to set a
5679-
list of servers at once as a comma-separated string.
5680-
5681-
Signed-off-by: Ben Greear <greearb@candelatech.com>
5682-
5683-
- version: now start on 1.7.4
5684-
5685-
- [Andrew C. Morrow brought this change]
5686-
5687-
fix memory leak in ares_getnameinfo
5688-
5689-
Version 1.7.3 (11 Jun 2010)
5690-
5691-
Daniel Stenberg (11 Jun 2010)
5692-
- changelogs: updated for 1.7.3
5693-
5694-
- [BogDan Vatra brought this change]
5695-
5696-
init: allow c-ares to work on Android OS

deps/cares/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ INCLUDE (CheckCSourceCompiles)
1010
INCLUDE (CheckStructHasMember)
1111
INCLUDE (CheckLibraryExists)
1212

13-
PROJECT (c-ares LANGUAGES C VERSION "1.20.0" )
13+
PROJECT (c-ares LANGUAGES C VERSION "1.20.1" )
1414

1515
# Set this version before release
16-
SET (CARES_VERSION "1.20.0")
16+
SET (CARES_VERSION "1.20.1")
1717

1818
INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are wrong.
1919

@@ -28,7 +28,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
2828
# For example, a version of 4:0:2 would generate output such as:
2929
# libname.so -> libname.so.2
3030
# libname.so.2 -> libname.so.2.2.0
31-
SET (CARES_LIB_VERSIONINFO "9:0:7")
31+
SET (CARES_LIB_VERSIONINFO "9:1:7")
3232

3333

3434
OPTION (CARES_STATIC "Build as a static library" OFF)

deps/cares/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ c-ares
66
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
77
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
88
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
9-
[![Releases](https://coderelease.io/badge/c-ares/c-ares)](https://coderelease.io/github/repository/c-ares/c-ares)
109

1110
This is c-ares, an asynchronous resolver library. It is intended for
1211
applications which need to perform DNS queries without blocking, or need to
@@ -22,8 +21,7 @@ If you find bugs, correct flaws, have questions or have comments in general in
2221
regard to c-ares (or by all means the original ares too), get in touch with us
2322
on the c-ares mailing list: https://lists.haxx.se/listinfo/c-ares
2423

25-
c-ares is of course distributed under the same MIT-style license as the
26-
original ares.
24+
c-ares is distributed the MIT license.
2725

2826
You'll find all c-ares details and news here:
2927
https://c-ares.org/

deps/cares/RELEASE-NOTES

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
c-ares version 1.20.0
1+
c-ares version 1.20.1
2+
3+
This release resolves a significant issue in the 1.20.0 release.
4+
5+
Bug fixes:
6+
o Resolve use-after-free issue when TCP connection is terminated before a
7+
response is returned [17]
8+
o Reduce number of queries for a load test case to prevent overloading some
9+
build systems
10+
o Fix fuzz test build target [18]
11+
12+
13+
c-ares 1.20.0 notes below:
214

315
This is a feature and bugfix release with some significant internal changes.
416

@@ -58,3 +70,5 @@ References to bug reports and discussions on issues:
5870
[14] = https://github.com/c-ares/c-ares/pull/526
5971
[15] = https://github.com/c-ares/c-ares/pull/525
6072
[16] = https://github.com/c-ares/c-ares/pull/524
73+
[17] = https://github.com/c-ares/c-ares/pull/562
74+
[18] = https://github.com/c-ares/c-ares/pull/559

deps/cares/aminclude_static.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# aminclude_static.am generated automatically by Autoconf
3-
# from AX_AM_MACROS_STATIC on Sat Oct 7 13:50:28 CEST 2023
3+
# from AX_AM_MACROS_STATIC on Sun Oct 8 23:23:39 CEST 2023
44

55

66
# Code coverage

deps/cares/configure

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.71 for c-ares 1.20.0.
3+
# Generated by GNU Autoconf 2.71 for c-ares 1.20.1.
44
#
55
# Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
66
#
@@ -855,8 +855,8 @@ MAKEFLAGS=
855855
# Identity of this package.
856856
PACKAGE_NAME='c-ares'
857857
PACKAGE_TARNAME='c-ares'
858-
PACKAGE_VERSION='1.20.0'
859-
PACKAGE_STRING='c-ares 1.20.0'
858+
PACKAGE_VERSION='1.20.1'
859+
PACKAGE_STRING='c-ares 1.20.1'
860860
PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
861861
PACKAGE_URL=''
862862

@@ -1650,7 +1650,7 @@ if test "$ac_init_help" = "long"; then
16501650
# Omit some internal or obsolete options to make the list less imposing.
16511651
# This message is too long to be a string in the A/UX 3.1 sh.
16521652
cat <<_ACEOF
1653-
\`configure' configures c-ares 1.20.0 to adapt to many kinds of systems.
1653+
\`configure' configures c-ares 1.20.1 to adapt to many kinds of systems.
16541654

16551655
Usage: $0 [OPTION]... [VAR=VALUE]...
16561656

@@ -1721,7 +1721,7 @@ fi
17211721

17221722
if test -n "$ac_init_help"; then
17231723
case $ac_init_help in
1724-
short | recursive ) echo "Configuration of c-ares 1.20.0:";;
1724+
short | recursive ) echo "Configuration of c-ares 1.20.1:";;
17251725
esac
17261726
cat <<\_ACEOF
17271727

@@ -1861,7 +1861,7 @@ fi
18611861
test -n "$ac_init_help" && exit $ac_status
18621862
if $ac_init_version; then
18631863
cat <<\_ACEOF
1864-
c-ares configure 1.20.0
1864+
c-ares configure 1.20.1
18651865
generated by GNU Autoconf 2.71
18661866

18671867
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2453,7 +2453,7 @@ cat >config.log <<_ACEOF
24532453
This file contains any messages produced by compilers while
24542454
running configure, to aid debugging if configure makes a mistake.
24552455

2456-
It was created by c-ares $as_me 1.20.0, which was
2456+
It was created by c-ares $as_me 1.20.1, which was
24572457
generated by GNU Autoconf 2.71. Invocation command line was
24582458

24592459
$ $0$ac_configure_args_raw
@@ -3426,7 +3426,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
34263426

34273427

34283428

3429-
CARES_VERSION_INFO="9:0:7"
3429+
CARES_VERSION_INFO="9:1:7"
34303430

34313431

34323432

@@ -7060,7 +7060,7 @@ fi
70607060

70617061
# Define the identity of the package.
70627062
PACKAGE='c-ares'
7063-
VERSION='1.20.0'
7063+
VERSION='1.20.1'
70647064

70657065

70667066
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -35354,7 +35354,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3535435354
# report actual input values of CONFIG_FILES etc. instead of their
3535535355
# values after options handling.
3535635356
ac_log="
35357-
This file was extended by c-ares $as_me 1.20.0, which was
35357+
This file was extended by c-ares $as_me 1.20.1, which was
3535835358
generated by GNU Autoconf 2.71. Invocation command line was
3535935359

3536035360
CONFIG_FILES = $CONFIG_FILES
@@ -35422,7 +35422,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
3542235422
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3542335423
ac_cs_config='$ac_cs_config_escaped'
3542435424
ac_cs_version="\\
35425-
c-ares config.status 1.20.0
35425+
c-ares config.status 1.20.1
3542635426
configured by $0, generated by GNU Autoconf 2.71,
3542735427
with options \\"\$ac_cs_config\\"
3542835428

deps/cares/configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#############################################################
2121
AC_PREREQ([2.60])
2222

23-
AC_INIT([c-ares], [1.20.0],
23+
AC_INIT([c-ares], [1.20.1],
2424
[c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
2525

26-
CARES_VERSION_INFO="9:0:7"
26+
CARES_VERSION_INFO="9:1:7"
2727
dnl This flag accepts an argument of the form current[:revision[:age]]. So,
2828
dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
2929
dnl 1.

deps/cares/include/ares_version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232

3333
#define ARES_VERSION_MAJOR 1
3434
#define ARES_VERSION_MINOR 20
35-
#define ARES_VERSION_PATCH 0
35+
#define ARES_VERSION_PATCH 1
3636
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
3737
(ARES_VERSION_MINOR<<8)|\
3838
(ARES_VERSION_PATCH))
39-
#define ARES_VERSION_STR "1.20.0"
39+
#define ARES_VERSION_STR "1.20.1"
4040

4141
#if (ARES_VERSION >= 0x010700)
4242
# define CARES_HAVE_ARES_LIBRARY_INIT 1

deps/cares/src/lib/ares_process.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ static void read_udp_packets_fd(ares_channel channel,
444444
continue;
445445

446446
handle_error(conn, now);
447-
447+
return;
448448
#ifdef HAVE_RECVFROM
449449
} else if (!same_address(&from.sa, &conn->server->addr)) {
450450
/* The address the response comes from does not match the address we
@@ -682,9 +682,10 @@ static void process_answer(ares_channel channel, const unsigned char *abuf,
682682
static void handle_error(struct server_connection *conn,
683683
struct timeval *now)
684684
{
685-
ares_channel channel = conn->server->channel;
686-
ares__llist_t *list_copy;
687-
ares__llist_node_t *node;
685+
ares_channel channel = conn->server->channel;
686+
struct server_state *server = conn->server;
687+
ares__llist_t *list_copy;
688+
ares__llist_node_t *node;
688689

689690
/* We steal the list from the connection then close the connection, then
690691
* iterate across the list to requeue any inflight queries with the broken
@@ -697,8 +698,8 @@ static void handle_error(struct server_connection *conn,
697698
while ((node = ares__llist_node_first(list_copy)) != NULL) {
698699
struct query *query = ares__llist_node_val(node);
699700

700-
assert(query->server == (int)conn->server->idx);
701-
skip_server(channel, query, conn->server);
701+
assert(query->server == (int)server->idx);
702+
skip_server(channel, query, server);
702703
/* next_server will remove the current node from the list */
703704
next_server(channel, query, now);
704705
}

doc/contributing/maintaining/maintaining-dependencies.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This a list of all the dependencies:
1212
* [ada 2.7.2][]
1313
* [base64][]
1414
* [brotli][]
15-
* [c-ares 1.20.0][]
15+
* [c-ares 1.20.1][]
1616
* [cjs-module-lexer][]
1717
* [corepack][]
1818
* [googletest][]
@@ -165,7 +165,7 @@ length-delimited strings.
165165
The [brotli](https://github.com/google/brotli) dependency is
166166
used for the homonym generic-purpose lossless compression algorithm.
167167

168-
### c-ares 1.20.0
168+
### c-ares 1.20.1
169169

170170
The [c-ares](https://github.com/c-ares/c-ares) is a C library
171171
for asynchronous DNS requests.
@@ -315,7 +315,7 @@ performance improvements not currently available in standard zlib.
315315
[ada 2.7.2]: #ada-272
316316
[base64]: #base64
317317
[brotli]: #brotli
318-
[c-ares 1.20.0]: #c-ares-1200
318+
[c-ares 1.20.1]: #c-ares-1200
319319
[cjs-module-lexer]: #cjs-module-lexer
320320
[corepack]: #corepack
321321
[dependency-update-action]: ../../../.github/workflows/tools.yml

0 commit comments

Comments
 (0)