Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit97f4ac2

Browse files
[3.14]gh-138998: Upgrade vendored expat to 2.7.2 (GH-138999) (#139024)
Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
1 parent6038447 commit97f4ac2

File tree

10 files changed

+764
-388
lines changed

10 files changed

+764
-388
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update bundled libexpat to 2.7.2

‎Misc/sbom.spdx.json‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎Modules/expat/expat.h‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
*/
4343

4444
#ifndef Expat_INCLUDED
45-
#defineExpat_INCLUDED1
45+
#defineExpat_INCLUDED1
4646

47-
#include<stdlib.h>
48-
#include"expat_external.h"
47+
#include<stdlib.h>
48+
#include"expat_external.h"
4949

50-
#ifdef __cplusplus
50+
#ifdef __cplusplus
5151
extern"C" {
52-
#endif
52+
#endif
5353

5454
structXML_ParserStruct;
5555
typedefstructXML_ParserStruct *XML_Parser;
5656

5757
typedefunsignedchar XML_Bool;
58-
#defineXML_TRUE ((XML_Bool)1)
59-
#defineXML_FALSE ((XML_Bool)0)
58+
#defineXML_TRUE ((XML_Bool)1)
59+
#defineXML_FALSE ((XML_Bool)0)
6060

6161
/* The XML_Status enum gives the possible return values for several
6262
API functions. The preprocessor #defines are included so this
@@ -73,11 +73,11 @@ typedef unsigned char XML_Bool;
7373
*/
7474
enum XML_Status {
7575
XML_STATUS_ERROR =0,
76-
#defineXML_STATUS_ERROR XML_STATUS_ERROR
76+
#defineXML_STATUS_ERROR XML_STATUS_ERROR
7777
XML_STATUS_OK =1,
78-
#defineXML_STATUS_OK XML_STATUS_OK
78+
#defineXML_STATUS_OK XML_STATUS_OK
7979
XML_STATUS_SUSPENDED =2
80-
#defineXML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
80+
#defineXML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
8181
};
8282

8383
enum XML_Error {
@@ -680,7 +680,7 @@ XMLPARSEAPI(void)
680680
XML_SetUserData(XML_Parser parser,void *userData);
681681

682682
/* Returns the last value set by XML_SetUserData or NULL.*/
683-
#defineXML_GetUserData(parser) (*(void **)(parser))
683+
#defineXML_GetUserData(parser) (*(void **)(parser))
684684

685685
/* This is equivalent to supplying an encoding argument to
686686
XML_ParserCreate. On success XML_SetEncoding returns non-zero,
@@ -752,7 +752,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
752752
XMLPARSEAPI(int)
753753
XML_GetIdAttributeIndex(XML_Parser parser);
754754

755-
#ifdef XML_ATTR_INFO
755+
#ifdef XML_ATTR_INFO
756756
/* Source file byte offsets for the start and end of attribute names and values.
757757
The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
758758
file an attribute value of "blah" will yield:
@@ -773,7 +773,7 @@ typedef struct {
773773
*/
774774
XMLPARSEAPI(const XML_AttrInfo *)
775775
XML_GetAttributeInfo(XML_Parser parser);
776-
#endif
776+
#endif
777777

778778
/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
779779
detected. The last call to XML_Parse must have isFinal true; len
@@ -970,9 +970,9 @@ XMLPARSEAPI(const char *)
970970
XML_GetInputContext(XML_Parser parser,int *offset,int *size);
971971

972972
/* For backwards compatibility with previous versions.*/
973-
#defineXML_GetErrorLineNumber XML_GetCurrentLineNumber
974-
#defineXML_GetErrorColumnNumber XML_GetCurrentColumnNumber
975-
#defineXML_GetErrorByteIndex XML_GetCurrentByteIndex
973+
#defineXML_GetErrorLineNumber XML_GetCurrentLineNumber
974+
#defineXML_GetErrorColumnNumber XML_GetCurrentColumnNumber
975+
#defineXML_GetErrorByteIndex XML_GetCurrentByteIndex
976976

977977
/* Frees the content model passed to the element declaration handler*/
978978
XMLPARSEAPI(void)
@@ -1032,7 +1032,10 @@ enum XML_FeatureEnum {
10321032
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
10331033
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
10341034
/* Added in Expat 2.6.0.*/
1035-
XML_FEATURE_GE
1035+
XML_FEATURE_GE,
1036+
/* Added in Expat 2.7.2.*/
1037+
XML_FEATURE_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT,
1038+
XML_FEATURE_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT,
10361039
/* Additional features must be added to the end of this enum.*/
10371040
};
10381041

@@ -1045,7 +1048,7 @@ typedef struct {
10451048
XMLPARSEAPI(const XML_Feature *)
10461049
XML_GetFeatureList(void);
10471050

1048-
#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
1051+
#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
10491052
/* Added in Expat 2.4.0 for XML_DTD defined and
10501053
* added in Expat 2.6.0 for XML_GE == 1.*/
10511054
XMLPARSEAPI(XML_Bool)
@@ -1057,7 +1060,17 @@ XML_SetBillionLaughsAttackProtectionMaximumAmplification(
10571060
XMLPARSEAPI(XML_Bool)
10581061
XML_SetBillionLaughsAttackProtectionActivationThreshold(
10591062
XML_Parser parser,unsignedlonglong activationThresholdBytes);
1060-
#endif
1063+
1064+
/* Added in Expat 2.7.2.*/
1065+
XMLPARSEAPI(XML_Bool)
1066+
XML_SetAllocTrackerMaximumAmplification(XML_Parser parser,
1067+
float maximumAmplificationFactor);
1068+
1069+
/* Added in Expat 2.7.2.*/
1070+
XMLPARSEAPI(XML_Bool)
1071+
XML_SetAllocTrackerActivationThreshold(
1072+
XML_Parser parser,unsignedlonglong activationThresholdBytes);
1073+
#endif
10611074

10621075
/* Added in Expat 2.6.0.*/
10631076
XMLPARSEAPI(XML_Bool)
@@ -1066,12 +1079,12 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10661079
/* Expat follows the semantic versioning convention.
10671080
See https://semver.org
10681081
*/
1069-
#defineXML_MAJOR_VERSION2
1070-
#defineXML_MINOR_VERSION7
1071-
#defineXML_MICRO_VERSION1
1082+
#defineXML_MAJOR_VERSION2
1083+
#defineXML_MINOR_VERSION7
1084+
#defineXML_MICRO_VERSION2
10721085

1073-
#ifdef __cplusplus
1086+
#ifdef __cplusplus
10741087
}
1075-
#endif
1088+
#endif
10761089

10771090
#endif/* not Expat_INCLUDED*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp