Skip to content

Commit 86a713c

Browse files
vstinnerlarryhastings
vstinner
authored and
larryhastings
committed
[3.4][Security] bpo-30947, bpo-31170: Update expat from 2.2.1 to 2.2.4 (#3353)
* bpo-30947, bpo-31170: Update expat from 2.2.1 to 2.2.4 * Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security fixes. * Update libexpat from 2.2.3 to 2.2.4. Fix copying of partial characters for UTF-8 input (libexpat bug 115): libexpat/libexpat#115 * Define XML_POOR_ENTROPY when compiling expat
1 parent d0e61bd commit 86a713c

23 files changed

+1289
-153
lines changed

‎Misc/NEWS.d/next/Library/2017-09-05-20-35-21.bpo-31170.QGmJ1t.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
expat: Update libexpat from 2.2.3 to 2.2.4. Fix copying of partial
2+
characters for UTF-8 input (libexpat bug 115):
3+
https://github.com/libexpat/libexpat/issues/115

‎Misc/NEWS.d/next/Security/2017-09-05-20-34-44.bpo-30947.iNMmm4.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Upgrade libexpat embedded copy from version 2.2.1 to 2.2.3 to get security
2+
fixes.

‎Modules/expat/ascii.h‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#define ASCII_A 0x41

‎Modules/expat/asciitab.h‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,

‎Modules/expat/expat.h‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#ifndef Expat_INCLUDED
@@ -24,7 +52,6 @@ extern "C" {
2452
struct XML_ParserStruct;
2553
typedef struct XML_ParserStruct *XML_Parser;
2654

27-
/* Should this be defined using stdbool.h when C99 is available? */
2855
typedef unsigned char XML_Bool;
2956
#define XML_TRUE ((XML_Bool) 1)
3057
#define XML_FALSE ((XML_Bool) 0)
@@ -1049,7 +1076,7 @@ XML_GetFeatureList(void);
10491076
*/
10501077
#define XML_MAJOR_VERSION 2
10511078
#define XML_MINOR_VERSION 2
1052-
#define XML_MICRO_VERSION 1
1079+
#define XML_MICRO_VERSION 4
10531080

10541081
#ifdef __cplusplus
10551082
}

‎Modules/expat/expat_external.h‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
#ifndef Expat_External_INCLUDED

‎Modules/expat/iasciitab.h‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

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

‎Modules/expat/internal.h‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,35 @@
1818
1919
Note: Use of these macros is based on judgement, not hard rules,
2020
and therefore subject to change.
21+
__ __ _
22+
___\ \/ /_ __ __ _| |_
23+
/ _ \\ /| '_ \ / _` | __|
24+
| __// \| |_) | (_| | |_
25+
\___/_/\_\ .__/ \__,_|\__|
26+
|_| XML parser
27+
28+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
29+
Copyright (c) 2000-2017 Expat development team
30+
Licensed under the MIT license:
31+
32+
Permission is hereby granted, free of charge, to any person obtaining
33+
a copy of this software and associated documentation files (the
34+
"Software"), to deal in the Software without restriction, including
35+
without limitation the rights to use, copy, modify, merge, publish,
36+
distribute, sublicense, and/or sell copies of the Software, and to permit
37+
persons to whom the Software is furnished to do so, subject to the
38+
following conditions:
39+
40+
The above copyright notice and this permission notice shall be included
41+
in all copies or substantial portions of the Software.
42+
43+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
44+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
45+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
46+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
47+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
48+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
49+
USE OR OTHER DEALINGS IN THE SOFTWARE.
2150
*/
2251

2352
#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__)

‎Modules/expat/latin1tab.h‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2-
See the file COPYING for copying permission.
1+
/*
2+
__ __ _
3+
___\ \/ /_ __ __ _| |_
4+
/ _ \\ /| '_ \ / _` | __|
5+
| __// \| |_) | (_| | |_
6+
\___/_/\_\ .__/ \__,_|\__|
7+
|_| XML parser
8+
9+
Copyright (c) 1997-2000 Thai Open Source Software Center Ltd
10+
Copyright (c) 2000-2017 Expat development team
11+
Licensed under the MIT license:
12+
13+
Permission is hereby granted, free of charge, to any person obtaining
14+
a copy of this software and associated documentation files (the
15+
"Software"), to deal in the Software without restriction, including
16+
without limitation the rights to use, copy, modify, merge, publish,
17+
distribute, sublicense, and/or sell copies of the Software, and to permit
18+
persons to whom the Software is furnished to do so, subject to the
19+
following conditions:
20+
21+
The above copyright notice and this permission notice shall be included
22+
in all copies or substantial portions of the Software.
23+
24+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
27+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
28+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
29+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.
331
*/
432

533
/* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,

0 commit comments

Comments
 (0)