Fix RAND_MAX overflow warnings #387
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GravisZro
changed the title
Lgt2x
reviewed
May 23, 2024
| @@ -34,9 +34,7 @@ | |||
| * $NoKeywords: $ | |||
| */ | |||
|
|
|||
| #undef RAND_MAX | |||
There was a problem hiding this comment.
This file seems to be missing include guards
There was a problem hiding this comment.
I approve these changes, the original file didn't have the guard either.
bryanperris
approved these changes
May 23, 2024
In `psrand.h` it attempts to undefine RAND_MAX and then redefine it. This may work on some compilers but G++/Clang. To resolve this error RAND_MAX was renamed to D3_RAND_MAX but **only** in files that included `psrand.h`. The code behavior should restored to that of the official release.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In
psrand.hit attempts to undefine RAND_MAX and then define it once again. This may work on some compilers but not G++/Clang. To resolve this error RAND_MAX was renamed to D3_RAND_MAX but only in files.cppthat includedpsrand.h. The code behavior should restored to that of the official release.NOTE: Not every overflow is fixed because as far as I can tell, that's how it is in the official release as
psrand.his not included everywhere RAND_MAX is used.Pull Request Type
Description
When compiling D3, there are several overflow warning regarding
RAND_MAX + 1because the value ofRAND_MAXcontains the same as INT32_MAX (0x7FFFFFFF). However,psrand.hdoes#undef RAND_MAXand then defines it as 0x7FFF. This does not work with G++ and Clang and the value0x7FFFFFFFis retained. Since compilers assume a given value is a signed integer (unless specified otherwise) adding one will cause an overflow and thus causing a overflow warning. This is a sign that the value of RAND_MAX was not redefined to0x7FFF. The solution is to simply rename references toRAND_MAXthat would be redefined (on a more forgiving compiler) fromRAND_MAXtoD3_RAND_MAX.However, not all parts of the code that use
RAND_MAXalso includepsrand.hwhich means the ISORAND_MAXvalue was likely used in the official release. This is why some overflow warnings will still persist after this patch.Related Issues
Screenshots (if applicable)
Checklist
Additional Comments