Skip to content

Commit c6d7a65

Browse files
Update bundled Expat to 2.8.5
1 parent 9777e8a commit c6d7a65

18 files changed

Lines changed: 501 additions & 455 deletions

‎Makefile.pre.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,7 @@ LIBEXPAT_HEADERS= \
631631
Modules/expat/expat_config.h \
632632
Modules/expat/expat_external.h \
633633
Modules/expat/fallthrough.h \
634+
Modules/expat/hash_table.h \
634635
Modules/expat/iasciitab.h \
635636
Modules/expat/internal.h \
636637
Modules/expat/latin1tab.h \

Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-156723.KxCF5N.rst renamed to Misc/NEWS.d/next/Security/2026-08-31-16-47-33.gh-issue-157953.KxCF5N.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Update bundled `libexpat <https://libexpat.github.io/>`_ to version 2.8.4.
1+
Update bundled `libexpat <https://libexpat.github.io/>`_ to version 2.8.5.

‎Misc/sbom.spdx.json‎

Lines changed: 43 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Modules/expat/expat.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com>
2121
Copyright (c) 2024 Taichi Haradaguchi <20001722@ymail.ne.jp>
2222
Copyright (c) 2025 Matthew Fernandez <matthew.fernandez@gmail.com>
23+
Copyright (c) 2026 Braian Plaku <braianplaku@gmail.com>
2324
Licensed under the MIT license:
2425
2526
Permission is hereby granted, free of charge, to any person obtaining
@@ -921,7 +922,9 @@ XML_SetParamEntityParsing(XML_Parser parser,
921922
Returns 1 if successful, 0 when called after parsing has started.
922923
Note: If parser == NULL, the function will do nothing and return 0.
923924
DEPRECATED since Expat 2.8.0.
925+
Please use XML_SetHashSalt16Bytes instead.
924926
*/
927+
XML_ATTR_DEPRECATED("please use XML_SetHashSalt16Bytes instead")
925928
XMLPARSEAPI(int)
926929
XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt);
927930

@@ -1040,8 +1043,11 @@ enum XML_FeatureEnum {
10401043
XML_FEATURE_MIN_SIZE,
10411044
XML_FEATURE_SIZEOF_XML_CHAR,
10421045
XML_FEATURE_SIZEOF_XML_LCHAR,
1046+
/* Added in Expat 2.0.0. */
10431047
XML_FEATURE_NS,
1048+
/* Added in Expat 2.0.1. */
10441049
XML_FEATURE_LARGE_SIZE,
1050+
/* Added in Expat 2.1.0. */
10451051
XML_FEATURE_ATTR_INFO,
10461052
/* Added in Expat 2.4.0. */
10471053
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
@@ -1096,7 +1102,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10961102
*/
10971103
# define XML_MAJOR_VERSION 2
10981104
# define XML_MINOR_VERSION 8
1099-
# define XML_MICRO_VERSION 4
1105+
# define XML_MICRO_VERSION 5
11001106

11011107
# ifdef __cplusplus
11021108
}

‎Modules/expat/expat_external.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk>
1717
Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com>
1818
Copyright (c) 2026 Matthew Fernandez <matthew.fernandez@gmail.com>
19+
Copyright (c) 2026 Braian Plaku <braianplaku@gmail.com>
1920
Licensed under the MIT license:
2021
2122
Permission is hereby granted, free of charge, to any person obtaining
@@ -128,6 +129,17 @@
128129
# define XML_ATTR_ALLOC_SIZE(x)
129130
# endif
130131

132+
/* Marks a function that Expat still provides but that callers should move off
133+
of. */
134+
# if defined(__clang__) || defined(__GNUC__)
135+
# define XML_ATTR_DEPRECATED(message) \
136+
__attribute__((__deprecated__(message)))
137+
# elif defined(_MSC_VER)
138+
# define XML_ATTR_DEPRECATED(message) __declspec(deprecated(message))
139+
# else
140+
# define XML_ATTR_DEPRECATED(message) // empty i.e. no deprecation
141+
# endif
142+
131143
# define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
132144

133145
# ifdef __cplusplus

0 commit comments

Comments
 (0)