Skip to content
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.

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

--[BUGFIX] - Revert markerset subconfig removals; Don't write empty configs to file #2435

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

jturner65
Copy link
Contributor

@jturner65 jturner65 commented Jul 25, 2024

Removing the markerset subconfigs when they were empty caused memory corruption in certain rare cases (python variables retaining possession of a removed variable), so the change introduced in this PR is being reverted;

Instead, a subconfig with no values in its entire subconfig hierarchy (all of its own subconfigs and so on, instead of just in its own primary map) will not be written to JSON.

Motivation and Context

How Has This Been Tested

Locally c++ and python tests. Also verified with python app that fix works.

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Removing the markerset subconfigs when they were empty caused memory corruption in certain rare cases, so this is change is being reverted; Instead, a subconfig with no values in its entire subconfig tree (instead of just in its own primary map) will not be written to JSON.
@jturner65 jturner65 requested a review from aclegg3 July 25, 2024 13:27
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jul 25, 2024
@jturner65 jturner65 requested review from 0mdc and mosra July 25, 2024 13:27
Copy link
Contributor

@0mdc 0mdc left a comment

Choose a reason for hiding this comment

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

LGTM!

@jturner65 jturner65 merged commit 5932ce6 into main Jul 25, 2024
9 of 10 checks passed
@jturner65 jturner65 deleted the BUGFIX_markersetSegfault branch July 25, 2024 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants