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.

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

Jump to bottom

mrmath: Fix unfreed memory #2784

Merged
merged 3 commits into from
Jan 23, 2024
Merged

mrmath: Fix unfreed memory #2784

merged 3 commits into from
Jan 23, 2024

Conversation

Lestropie
Copy link
Member

Resolves #2781.

On having a quick look at this it turned out to be not as complicated as I had feared, so I just went through and got it done. This appears to happily pass tests with the address sanitiser enabled.

@Lestropie Lestropie added the bug label Jan 23, 2024
@Lestropie Lestropie added this to the 3.1.0 updates milestone Jan 23, 2024
@Lestropie Lestropie requested a review from a team January 23, 2024 00:31
@Lestropie Lestropie self-assigned this Jan 23, 2024
@Lestropie
Merge remote-tracking branch 'origin/dev' into mrmath_memleak_fix
e467385 
Conflicts:
	core/misc/voxel2vector.h

Resolves #2781 with #2764.
@github-actions GitHub Actions
Copy link

clang-tidy review says "All clean, LGTM! 👍"

@Lestropie Lestropie mentioned this pull request Jan 23, 2024
Closed
@Lestropie
mrmath: Fix conflict resolution
b1767b7 
Merge commit e467385 failed to address fact that modifications made in dae868c utilised MR::vector whereas 7d81f13 merged in #2764 reverts to use of std::vector.
@github-actions GitHub Actions
Copy link

clang-tidy review says "All clean, LGTM! 👍"

@Lestropie Lestropie enabled auto-merge January 23, 2024 01:06
@Lestropie Lestropie merged commit ae76341 into dev Jan 23, 2024
6 checks passed
@Lestropie Lestropie deleted the mrmath_memleak_fix branch January 23, 2024 01:19
@Lestropie Lestropie mentioned this pull request Feb 20, 2024
Closed
Lestropie added a commit that referenced this pull request Feb 21, 2024
@Lestropie
mrmath: Fix compilation
fed589b 
Resolves changes made to cmd/mrmath.cpp in #2784 to prevent memory leak against removal of MR::vector in #2689.
Lestropie added a commit that referenced this pull request Feb 21, 2024
@Lestropie
core/misc/voxel2vector.h: Fix compilation
4a51096 
Resolves changes made to fix unfreed memory in mrmath in #2784 against removal of MR::vector in #2764.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Lestropie Lestropie

Labels
bug
Projects
None yet
Milestone
3.1.0 updates
Development

Successfully merging this pull request may close these issues.
1 participant
@Lestropie