Skip to content

Commit ba39ab0

Browse files
[3.10] gh-155558: Update bundled Expat to 2.8.3 (GH-155560)
(cherry picked from commit 3d6a505) Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent 31e6a4c commit ba39ab0

24 files changed

Lines changed: 122 additions & 48 deletions
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Update bundled `libexpat <https://libexpat.github.io/>`_ to version 2.8.3
2+
for the fix to :cve:`2026-72522`.

Modules/expat/ascii.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3232
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3333
USE OR OTHER DEALINGS IN THE SOFTWARE.
34+
35+
SPDX-License-Identifier: MIT
3436
*/
3537

3638
#define ASCII_A 0x41

Modules/expat/asciitab.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3131
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3232
USE OR OTHER DEALINGS IN THE SOFTWARE.
33+
34+
SPDX-License-Identifier: MIT
3335
*/
3436

3537
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,

Modules/expat/expat.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
4141
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
4242
USE OR OTHER DEALINGS IN THE SOFTWARE.
43+
44+
SPDX-License-Identifier: MIT
4345
*/
4446

4547
#ifndef Expat_INCLUDED
@@ -1094,7 +1096,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10941096
*/
10951097
# define XML_MAJOR_VERSION 2
10961098
# define XML_MINOR_VERSION 8
1097-
# define XML_MICRO_VERSION 2
1099+
# define XML_MICRO_VERSION 3
10981100

10991101
# ifdef __cplusplus
11001102
}

Modules/expat/expat_external.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3737
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3838
USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
40+
SPDX-License-Identifier: MIT
3941
*/
4042

4143
#ifndef Expat_External_INCLUDED

Modules/expat/fallthrough.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
2828
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2929
USE OR OTHER DEALINGS IN THE SOFTWARE.
30+
31+
SPDX-License-Identifier: MIT
3032
*/
3133

3234
#ifndef FALLTHROUGH_H

Modules/expat/iasciitab.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3131
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3232
USE OR OTHER DEALINGS IN THE SOFTWARE.
33+
34+
SPDX-License-Identifier: MIT
3335
*/
3436

3537
/* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */

Modules/expat/internal.h

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
5454
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
5555
USE OR OTHER DEALINGS IN THE SOFTWARE.
56+
57+
SPDX-License-Identifier: MIT
5658
*/
5759

5860
#if defined(__GNUC__) && defined(__i386__) && ! defined(__MINGW32__)
@@ -123,20 +125,11 @@
123125
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
124126
# endif
125127
#else
128+
# include <inttypes.h> // PRIdPTR, PRIuPTR
126129
# define EXPAT_FMT_LLX(midpart) "%" midpart "llx"
127130
# define EXPAT_FMT_ULL(midpart) "%" midpart "llu"
128-
# if ! defined(ULONG_MAX)
129-
# error Compiler did not define ULONG_MAX for us
130-
# elif ULONG_MAX == 18446744073709551615u // 2^64-1
131-
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
132-
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "lu"
133-
# elif defined(__wasm32__) // 32bit mode Emscripten or WASI SDK
134-
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "ld"
135-
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "zu"
136-
# else
137-
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "d"
138-
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart "u"
139-
# endif
131+
# define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart PRIdPTR
132+
# define EXPAT_FMT_SIZE_T(midpart) "%" midpart PRIuPTR
140133
#endif
141134

142135
#ifndef UNUSED_P

Modules/expat/latin1tab.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
3131
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
3232
USE OR OTHER DEALINGS IN THE SOFTWARE.
33+
34+
SPDX-License-Identifier: MIT
3335
*/
3436

3537
/* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,

Modules/expat/memory_sanitizer.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
2828
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2929
USE OR OTHER DEALINGS IN THE SOFTWARE.
30+
31+
SPDX-License-Identifier: MIT
3032
*/
3133

3234
#if ! defined(MEMORY_SANITIZER_H)

0 commit comments

Comments
 (0)