Skip to content

[Backport 2.15] Correct JacksonEvent.merge() null-key handling and close InputStโ€ฆ - #6819

Merged
dlvenable merged 1 commit into
2.15from
backport/backport-6775-to-2.15
May 5, 2026
Merged

dlvenable merged 1 commit into
2.15from
backport/backport-6775-to-2.15

Conversation

@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor

Backport 569ae3a from #6775

)

Fix JacksonEvent.merge() null-key bug and InputStream leak

Harden XML parser in LastReleasedVersionProvider against XXE attacks.

Signed-off-by: Siqi Ding <dingdd@amazon.com>
(cherry picked from commit 569ae3a)
@github-actions

github-actions Bot commented May 4, 2026 •

Copy link
Copy Markdown

Unit Test Results

โŸโ€„4โ€ˆ259 filesโ€„ +โŸโ€„2โ€ˆ047โ€‚โ€ƒโŸโ€„4โ€ˆ259 suitesโ€„ +2โ€ˆ047โ€‚โ€ƒโ€‚2h 4m 36s โฑ๏ธ + 58m 52s
13โ€ˆ925 tests +โŸโ€„โŸโ€„โ€ˆ604โ€‚โ€ƒ13โ€ˆ918 โœ”๏ธ +โŸโ€„โŸโ€„โ€ˆ606โ€‚โ€ƒโŸโ€„7 ๐Ÿ’ค ยฑโŸโ€„0โ€‚โ€ƒ0 โŒ โ€†-โ€Š2โ€‚
39โ€ˆ696 runsโ€† +17โ€ˆ373โ€‚โ€ƒ39โ€ˆ675 โœ”๏ธ +17โ€ˆ363โ€‚โ€ƒ21 ๐Ÿ’ค +12โ€‚โ€ƒ0 โŒ โ€†-โ€Š2โ€‚

Results for commit ff2afc7.โ€ƒยฑ Comparison against base commit cb4efd2.

โ™ป๏ธ This comment has been updated with latest results.

@dlvenable
dlvenable merged commit c8ca98b into 2.15 May 5, 2026
85 of 87 checks passed
@dlvenable dlvenable added this to the v2.15.1 milestone May 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants