Commit graph

4144 commits

Author SHA1 Message Date
Sebastian Pipping
a590b2d584
Merge pull request #834 from libexpat/issue-832-prepare-release
Prepare release 2.6.1 (part of #832, ETA 2024-02-29)
2024-02-29 21:19:01 +01:00
Sebastian Pipping
1cf882e79c
Merge pull request #836 from libexpat/issue-828-expose-billion-laughs-api-with-xml-dtd-without-xml-ge
Expose billion laughs API with `XML_DTD` without `XML_GE` (fixes #828)
2024-02-29 20:07:11 +01:00
Sebastian Pipping
58ff7c39ea Sync file headers 2024-02-28 23:41:43 +01:00
Sebastian Pipping
fce4b9f3b3 Set release date for 2.6.1 2024-02-28 23:41:42 +01:00
Sebastian Pipping
dfe043fe6a Bump version to 2.6.1 2024-02-28 23:41:31 +01:00
Sebastian Pipping
fbe7b9345b Bump version info from 10:0:9 to 10:1:9
See https://verbump.de/ for what these numbers do
2024-02-28 23:41:31 +01:00
Sebastian Pipping
3dc137ea05 Changes: Document changes in release Expat 2.6.1 2024-02-28 23:41:29 +01:00
Sebastian Pipping
ea52834709 doc/reference.html: Drop inaccurate statement about XML_* macros
The statement is falsified by these macros:
- XML_ATTR_INFO
- XML_DTD
- XML_GE
2024-02-28 20:47:45 +01:00
Sebastian Pipping
1e028f2ef7 lib/expat.h: Expose billion laughs API for XML_DTD without XML_GE
Regression from commit caa2719863 .
2024-02-28 20:47:45 +01:00
Sebastian Pipping
a387201ca4
Merge pull request #833 from libexpat/configure-ac-protect-multilib
`configure.ac`: Protect against `expat_config.h.in` defining `SIZEOF_VOID_P`
2024-02-28 00:55:34 +01:00
Sebastian Pipping
0106682ea6 configure.ac: Protect against expat_config.h.in defining SIZEOF_VOID_P 2024-02-27 00:33:53 +01:00
Sebastian Pipping
9dcb74f552
Merge pull request #829 from libexpat/hide-test-only-code-behind-new-macro
Hide test-only code behind new (internal) macro `XML_TESTING` (alternative to #826)
2024-02-26 21:41:30 +01:00
Sebastian Pipping
7e2a0da9ba lib: Hide some test-only code behind new macro XML_TESTING 2024-02-21 13:07:35 +01:00
Sebastian Pipping
a4a420eedc Autotools: Turn libexpatinternal.la into standalone library
.. so that we can now have code in say xmlparse.c that does not
end up in libexpat.so but still runs when executing the test suite.
2024-02-21 12:53:03 +01:00
Sebastian Pipping
5b940f4a65
Merge pull request #824 from libexpat/issue-821-improve-make-clean-for-configure-without-docbook
Autotools: Re-work handling of xmlwf.1 (fixes #821)
2024-02-20 20:40:41 +01:00
Sebastian Pipping
0f6b39d2f5 Autotools: Re-work handling of xmlwf.1
File "doc/xmlwf.1" should not be cleaned when building with
"./configure --without-docbook", and re-compilation of the file
should take precedence over a pre-built copy where available.

Also, variable CLEANFILES can be used to simplify things a bit
in Makefile.am.
2024-02-13 20:12:15 +01:00
Sebastian Pipping
b7e1a11011
Merge pull request #817 from SonyMobile/clockless-test
tests: Replace clock counting with counting scanned bytes
2024-02-13 18:30:35 +01:00
Snild Dolkow
dc8499f295 tests: Replace clock counting with scanned bytes in linear-time test
This removes the dependency on CLOCKS_PER_SEC that prevented this test
from running properly on some platforms, as well as the inherent
flakiness of time measurements.

Since later commits have introduced g_bytesScanned (and before that,
g_parseAttempts), we can use that value as a proxy for parse time
instead of clock().
2024-02-13 14:05:44 +01:00
Snild Dolkow
fe0177cd3f tests: Replace g_parseAttempts with g_bytesScanned
This was used to estimate the number of scanned bytes. Just exposing
that number directly will be more precise.
2024-02-13 13:57:35 +01:00
Sebastian Pipping
4ff4c544aa
Merge pull request #820 from libexpat/dependabot/github_actions/actions/upload-artifact-4.3.1
Actions(deps): Bump actions/upload-artifact from 4.3.0 to 4.3.1
2024-02-12 14:52:18 +01:00
dependabot[bot]
aed1ed769d
Actions(deps): Bump actions/upload-artifact from 4.3.0 to 4.3.1
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](26f96dfa69...5d5d22a312)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-12 12:09:58 +00:00
Sebastian Pipping
226201d10d
Merge pull request #819 from th1722/patch-1
Fix compiler warnings
2024-02-11 16:45:16 +01:00
Taichi Haradaguchi
3f60a47cb5 Fix compiler warnings
> In file included from ./../lib/internal.h:149,
>                  from codepage.c:38:
> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef]
>  1045 | #if XML_GE == 1
>       |     ^~~~~~
> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 [-Wundef]
>   158 | #if XML_GE == 1
>       |     ^~~~~~
2024-02-10 23:08:03 +09:00
Sebastian Pipping
4033d6dc57
Merge pull request #818 from libexpat/fix-clang-format-ci
Get clang-format CI back in sync
2024-02-08 17:24:26 +01:00
clang-format 18.1.0
d4f958e345 Mass-apply clang-format 18.1.0 2024-02-08 15:21:53 +01:00
Sebastian Pipping
849da3e3fe
Merge pull request #776 from libexpat/issue-775-prepare-release
Prepare release 2.6.0 (part of #775, ETA is 2024-02-07)
2024-02-06 17:49:41 +01:00
Sebastian Pipping
2a10e173ab Sync file headers 2024-02-06 14:13:00 +01:00
Sebastian Pipping
92f10eb800 .mailmap: Add Joyce Brum and Owain Davies 2024-02-06 14:08:05 +01:00
Sebastian Pipping
b5ae2481b0 Set release date for 2.6.0 2024-02-06 14:08:05 +01:00
Sebastian Pipping
310a1977f4 Bump version to 2.6.0 2024-02-06 14:08:05 +01:00
Sebastian Pipping
b9fd465231 Bump version info from 9:10:8 to 10:0:9
See https://verbump.de/ for what these numbers do
2024-02-06 14:08:05 +01:00
Sebastian Pipping
ae06168b64 Changes: Document changes in release Expat 2.6.0 2024-02-06 14:08:05 +01:00
Sebastian Pipping
8198e4bfed
Merge pull request #815 from libexpat/fix-pkg-config-file-for-static-build-on-windows
pkg-config: Add missing `-DXML_STATIC` for Windows (alternative to #805)
2024-02-06 11:09:42 +01:00
Sebastian Pipping
9c16d1c5b4 pkg-config: Add missing -DXML_STATIC (for Windows)
This affects the output of command "pkg-config --cflags --static expat".
2024-02-06 00:17:30 +01:00
Sebastian Pipping
9944b71234
Merge pull request #813 from libexpat/issue-812-protect-against-closing-entities-out-of-order
Protect against closing entities out of order (fixes #812)
2024-02-06 00:16:23 +01:00
Sebastian Pipping
b6243248a9
Merge pull request #814 from libexpat/fix-make-check-for-arm64-freebsd
tests: Fix `CLOCKS_PER_SEC` guard for arm64 FreeBSD reality
2024-02-06 00:00:00 +01:00
Sebastian Pipping
aba268e2c0 tests/basic_tests.c: Fix CLOCKS_PER_SEC guard for arm64 FreeBSD reality
CLOCKS_PER_SEC turned out to be as small as 128 in practice
on machine cfarm240.cfarm.net .
2024-02-02 18:11:12 +01:00
Sebastian Pipping
127aa340d3
Merge pull request #809 from libexpat/clang-format-18
CI: Upgrade to clang-format 18
2024-01-31 01:49:59 +01:00
Sebastian Pipping
7352d3035b clang-*.yml: Fix accidental trailing whitespace 2024-01-30 22:58:48 +01:00
Sebastian Pipping
37d0184781 clang-format.yml: Bump to clang-format 18 2024-01-30 22:57:10 +01:00
clang-format 18.1.0
137a578087 Mass-apply clang-format 18.1.0 2024-01-30 22:57:09 +01:00
Sebastian Pipping
c594eedfa8 apply-clang-format.sh: Drop workaround for lib/siphash.h
Does not seem needed anymore (or running the script would
produce a diff).
2024-01-30 22:57:09 +01:00
Sebastian Pipping
5d2a438af2 apply-clang-format.sh: Use "git ls-files" rather than "find"
.. and reduce difference with sibling script apply-clang-tidy.sh .
2024-01-30 22:57:09 +01:00
Sebastian Pipping
34b598c5f5
Merge pull request #789 from SonyMobile/partial-token-perf
Speed up parsing of big tokens
2024-01-30 22:54:37 +01:00
Sebastian Pipping
bc7490a4a7 tests/misc_tests.c: Add regression test for closing entities out of order 2024-01-30 03:39:46 +01:00
Sebastian Pipping
c4208e7fd1 lib/xmlparse.c: Protect against closing entities out of order 2024-01-30 02:40:31 +01:00
Sebastian Pipping
d5b02e96ab xmlwf: Document argument "-q"
Rebased-and-adapted-by: Snild Dolkow <snild@sony.com>
2024-01-29 19:59:18 +01:00
Sebastian Pipping
09fdf998e7 xmlwf: Support disabling reparse deferral
Rebased-and-adapted-by: Snild Dolkow <snild@sony.com>
2024-01-29 19:59:18 +01:00
Snild Dolkow
8f8aaf5c8e tests: Check heuristic bypass with varying buffer fill sizes
The bypass works on the assumption that the application uses a
consistent fill size. Let's make some assertions about what should
happen when the application doesn't do that -- most importantly,
that parsing does happen eventually, and that the number of scanned
bytes doesn't explode.
2024-01-29 19:59:18 +01:00
Snild Dolkow
182bbc350e tests: Make it clear to clang-tidy that assert_true may not return
The key is to have __attribute__((noreturn)) somewhere that clang-tidy
can see it. In this case, this is the _fail() function, which is
conditionally called from the assert_true() macro.

This will ensure that clang-tidy doesn't complain about NULL values
that we've asserted against in tests.
2024-01-29 19:57:54 +01:00