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

Fix bugs affecting blabber of *BSD #2133

Merged
merged 4 commits into from
Jan 4, 2024
Merged

Fix bugs affecting blabber of *BSD #2133

merged 4 commits into from
Jan 4, 2024

Conversation

lmoureaux
Copy link
Contributor

All bugs could have been spotted by running with ASan more often:

  1. The wrong type of cast was used in the listener destructor. ASan warned about it.
  2. NULL had been changed to nullptr in SQL code. Modpack installer fails to create database due to invalid SQL #2128
  3. A use-after-free condition was present when shutting down audio. Heap-use-after-free when trying to play audio on client exit #2132
  4. Advisor data wasn't resized properly when switching tileset.

All commits are backport candidates.

@lmoureaux
Fix wrong cast type in listener<>::~listener()
abfdb83
@lmoureaux
Fix nullptr literal appearing in SQL code
8716b41 
Closes longturn#2128.
@lmoureaux
Fix use-after-free on shutdown in options/audio
236dcb0 
Closes longturn#2132.
@lmoureaux
Fix resizing advisor data when switching ruleset
fadb1fb 
Move to std::vector. This fixes a crash when switching from the default ruleset
to civ2civ3 or Royale, which have more governments.

Thanks to blabber for reporting.
@lmoureaux lmoureaux requested a review from jwrober January 3, 2024 23:48
@jwrober jwrober added the back-port back-port candidate label Jan 4, 2024
@lmoureaux lmoureaux merged commit ce2d762 into longturn:master Jan 4, 2024
21 checks passed
@lmoureaux lmoureaux deleted the bugfix/asan branch January 4, 2024 00:32
@jwrober jwrober mentioned this pull request Jan 4, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwrober jwrober jwrober approved these changes

Assignees

@lmoureaux lmoureaux

Labels
back-port back-port candidate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lmoureaux @jwrober