Skip to content

gh-149017: Upgrade bundled Expat to 2.8.0 #149020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StanFromIreland merged 5 commits into from
Apr 27, 2026
Merged

gh-149017: Upgrade bundled Expat to 2.8.0 #149020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66f9412
Upgrade bundled Expat to 2.8.0
StanFromIreland Apr 26, 2026
9aa2874
Include the new `random_` headers
StanFromIreland Apr 26, 2026
89517f4
Revert "Include the new `random_` headers"
StanFromIreland Apr 26, 2026
b8a1bd4
We don't actually need 'em
StanFromIreland Apr 26, 2026
c80066b
And patch two includes out :-/
StanFromIreland Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
And patch two includes out :-/
  • Loading branch information
@StanFromIreland
StanFromIreland committed Apr 26, 2026
commit c80066ba2ceaef2d6931fa78a16f114c08d159c6
4 changes: 2 additions & 2 deletions Misc/sbom.spdx.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Modules/expat/refresh.sh
View file
Open in desktop
Comment thread
StanFromIreland marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,18 @@ This may be due to source changes and will require updating this script" >&2
exit 1
fi

# Step 4: Skip the Windows rand_s entropy path in xmlparse.c when
# XML_POOR_ENTROPY is set.
sed -z -i 's|#if defined(_WIN32)\n# include "random_rand_s\.h"\n#endif /\* defined(_WIN32) \*/|#if defined(_WIN32) \&\& ! defined(XML_POOR_ENTROPY)\n# include "random_rand_s.h"\n#endif /* defined(_WIN32) \&\& ! defined(XML_POOR_ENTROPY) */|' xmlparse.c
sed -z -i 's|# ifdef _WIN32\n if (writeRandomBytes_rand_s|# if defined(_WIN32) \&\& ! defined(XML_POOR_ENTROPY)\n if (writeRandomBytes_rand_s|' xmlparse.c

if ! grep -q '#if defined(_WIN32) && ! defined(XML_POOR_ENTROPY)' xmlparse.c; then
echo "
Error: rand_s gate not patched in xmlparse.c;
This may be due to source changes and will require updating this script" >&2
exit 1
fi

echo '
Updated! next steps:
- Verify all is okay:
Expand Down
6 changes: 3 additions & 3 deletions Modules/expat/xmlparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
# include "random_getrandom.h"
#endif /* defined(HAVE_GETRANDOM) || defined(HAVE_SYSCALL_GETRANDOM) */

#if defined(_WIN32)
#if defined(_WIN32) && ! defined(XML_POOR_ENTROPY)
# include "random_rand_s.h"
#endif /* defined(_WIN32) */
#endif /* defined(_WIN32) && ! defined(XML_POOR_ENTROPY) */

#if ! defined(HAVE_GETRANDOM) && ! defined(HAVE_SYSCALL_GETRANDOM) \
&& ! defined(HAVE_ARC4RANDOM_BUF) && ! defined(HAVE_ARC4RANDOM) \
Expand Down Expand Up @@ -1088,7 +1088,7 @@ generate_hash_secret_salt(void) {
return ENTROPY_DEBUG("arc4random", entropy);
#else
/* Try high quality providers first .. */
# ifdef _WIN32
# if defined(_WIN32) && ! defined(XML_POOR_ENTROPY)
if (writeRandomBytes_rand_s(&entropy, sizeof(entropy))) {
return ENTROPY_DEBUG("rand_s", entropy);
}
Expand Down
Loading