-
Notifications
You must be signed in to change notification settings - Fork 227
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
Server: Fix --serverinfo country code misinterpretation on Qt6 #2829
Server: Fix --serverinfo country code misinterpretation on Qt6 #2829
Conversation
@acerix Could you please try a build from this PR and confirm if it works as expected with your original, pre-3.9.0 |
c6d1cb4
to
8af8740
Compare
@hoffie can you pick this up? |
On Qt6, we previously relied on the caller to only supply country codes within bounds. With this change we properly check before risking an uninitialized array access. On Qt5, we did not do any checks at all. Now we ensure that we what is provided is a valid Qt5 country code. Related: jamulussoftware#2809
Previously, country codes in --serverinfo were interpreted natively. This worked for Qt5, but caused unintended changes on Qt6 builds as the codes differ. Not doing a conversion for --serverinfo was an oversight from the initial Qt6 compatibility work, which is now fixed with this change. Related: jamulussoftware#2299 Fixes: jamulussoftware#2809
8af8740
to
20a25c4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested on macOS and it's ok. Thanks!
Removing |
Can you get an issue raised, too, please (and added to the board). |
Hm? We have collected all pre-known release announcement items right in the existing 3.9.1 tracker #2813. I have added this PR there (that's what I meant above). Do you want a separate issue for the sub-task (write the release announcement) or even for each sub-item? We didn't have that until now. |
No - but if documentation needs updating, there will be a pull request. I like an issue for each pull request, so the pull request isn't just "floating". |
As far as I can see, we won't need to update existing documentation on the website for this issue (Qt6 bugfix). I had added the label as a reminder for the release announcement and have now removed it as it is properly tracked. |
Ah right, if it was just for the release announcement, then so long as there's a reminder there, then "done". |
Short description of changes
Util: Make CLocale::IsCountryCodeSupported more robust
On Qt6, we previously relied on the caller to only supply country codes within bounds. With this change we properly check before risking an uninitialized array access.
On Qt5, we did not do any checks at all. Now we ensure that we what is provided is a valid Qt5 country code.
Server: Fix --serverinfo country code misinterpretation on Qt6
Previously, country codes in --serverinfo were interpreted natively.
This worked for Qt5, but caused unintended changes on Qt6 builds as the codes differ. Not doing a conversion for --serverinfo was an oversight from the initial Qt6 compatibility work, which is now fixed with this change.
CHANGELOG: Server: Fixed --serverinfo country code misinterpretation introduced in Jamulus 3.9.0 on Qt6-based builds such as Mac
Context: Fixes an issue?
Related: #2299
Fixes: #2809
Does this change need documentation? What needs to be documented and how?
Status of this Pull Request
Ready. Tested both on Qt5 and Qt6. Qt6 builds with this change behave like Qt5 builds again.
What is missing until this pull request can be merged?
Reviews.
Checklist