Skip to content

ENH: Update libexpat files#2755

Merged
dzenanz merged 4 commits intoInsightSoftwareConsortium:masterfrom
agravgaard:master
Sep 28, 2021
Merged

ENH: Update libexpat files#2755
dzenanz merged 4 commits intoInsightSoftwareConsortium:masterfrom
agravgaard:master

Conversation

@agravgaard
Copy link
Contributor

@agravgaard agravgaard commented Sep 24, 2021

The hash method in the old expat would have integer overflows which are
UB. This may have been intentional and not caused error because the UB
result has either been the same on all tested systems or not been relied
upon by anyone.

Related issue in RTK which inspired this PR: https://github.com/SimonRit/RTK/issues/430

PR Checklist

  • No API changes were made (or the changes have been approved)
  • No major design changes were made (or the changes have been approved)
  • Added test (or behavior not changed)
  • Updated API documentation (or API not changed)
  • Added license to new files (if any)
  • Added Python wrapping to new files (if any) as described in ITK Software Guide Section 9.5
  • Added ITK examples for all new major features (if any)

Refer to the ITK Software Guide for
further development details if necessary.

@github-actions github-actions bot added area:ThirdParty Issues affecting the ThirdParty module type:Enhancement Improvement of existing methods or implementation type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots labels Sep 24, 2021
@agravgaard agravgaard force-pushed the master branch 3 times, most recently from f51f7fc to 46c0247 Compare September 24, 2021 11:09
@agravgaard
Copy link
Contributor Author

agravgaard commented Sep 24, 2021

I don't currently have a Windows machine to test on.
Could anyone give me a clue on how to correct this one:
https://dev.azure.com/itkrobotwindow/ITK.Windows/_build/results?buildId=6576&view=logs&j=2d2b3007-3c5c-5840-9bb0-2b1ea49925f3&t=77aad734-2057-5694-9ae2-ee1f5f26eae8&l=5048

@SimonRit
Copy link

SimonRit commented Sep 24, 2021

Have you regenerated itk_expat_mangle.h as indicated here? It might be something to do...

@dzenanz
Copy link
Member

dzenanz commented Sep 24, 2021

Could you break up this PR into more commits? Some preparatory commit(s), the main commit which copies new external code over the existing one, then some follow-up commit(s). That way we don't need to review the third-party code, only the changes in our code, or our changes to the third-party code. You can find recent examples: #2683 and #2708.

dzenanz
dzenanz reviewed Sep 24, 2021
View reviewed changes
dzenanz
dzenanz reviewed Sep 27, 2021
View reviewed changes
@agravgaard agravgaard force-pushed the master branch 2 times, most recently from e3af2f1 to 1feb3e8 Compare September 28, 2021 08:11
dzenanz
dzenanz approved these changes Sep 28, 2021
View reviewed changes
Copy link
Member

@dzenanz dzenanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is good even as-is. The remaining remarks are optional.

@agravgaard
ENH: Update exported symbols for expat
ea54bc7 
ENH: Use the same sort method as previously
@agravgaard
ENH: re-apply ITK symbol export definitions
0e9afe9 
BUG: avoid redefining definition
dzenanz
dzenanz approved these changes Sep 28, 2021
View reviewed changes
Copy link
Member

@dzenanz dzenanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@dzenanz
Copy link
Member

dzenanz commented Sep 28, 2021

To be merged when CI comes back green.

@dzenanz dzenanz merged commit f37e2cb into InsightSoftwareConsortium:master Sep 28, 2021
@dzenanz dzenanz mentioned this pull request Feb 10, 2022
Closed
@jcfr jcfr mentioned this pull request Feb 10, 2022
Merged
2 tasks
dzenanz pushed a commit that referenced this pull request Feb 14, 2022
@jcfr @dzenanz
COMP: Fix build against ITK install adding "expat_external.h" install…
1f7b427 
… rule

This commit fixes a regression introduced in 9e337d3 (ENH: Update expat
files) by pull request #2755 on 2021-09-27.

ITK issue is #3186 and problem was first documented in
Slicer/SlicerExecutionModel#137
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dzenanz dzenanz dzenanz approved these changes

Assignees

No one assigned

Labels

area:ThirdParty Issues affecting the ThirdParty module type:Enhancement Improvement of existing methods or implementation type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@agravgaard @SimonRit @dzenanz