[core] Add nullness checking from static analysis #6361
+61
−43
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
Xaver-DaRed
approved these changes
Oct 17, 2024
zach2good
reviewed
Oct 18, 2024
|
|
||
| int32 CE = (int32)(80.f / damageMod * Damage); | ||
| int32 VE = (int32)(240.f / damageMod * Damage); | ||
| if (m_EnmityHolder) |
There was a problem hiding this comment.
Can we invert this so the whole function isn't indented?
if m_EnmityHolder == nullptr, return
| @@ -340,7 +340,7 @@ void CMeritPoints::RaiseMerit(MERIT_TYPE merit) | |||
| { | |||
| Merit_t* PMerit = GetMeritPointer(merit); | |||
|
|
|||
| if (m_MeritPoints >= PMerit->next && PMerit->count < PMerit->upgrade && GetMeritCountInSameCategory(merit) < meritCatInfo[GetMeritCategory(merit)].MaxPoints) | |||
| if (PMerit && m_MeritPoints >= PMerit->next && PMerit->count < PMerit->upgrade && GetMeritCountInSameCategory(merit) < meritCatInfo[GetMeritCategory(merit)].MaxPoints) | |||
There was a problem hiding this comment.
Similarly here, should we be doing if PMerit is nullptr, message, and bail out early instead of rolling it into all of these other checks?
| @@ -372,30 +372,32 @@ void CMeritPoints::RaiseMerit(MERIT_TYPE merit) | |||
| void CMeritPoints::LowerMerit(MERIT_TYPE merit) | |||
| { | |||
| Merit_t* PMerit = GetMeritPointer(merit); | |||
|
|
|||
| if (PMerit->count > 0) | |||
| if (PMerit) | |||
There was a problem hiding this comment.
Same here, check and bail out please
| @@ -4855,7 +4855,7 @@ void SmallPacket0x077(map_session_data_t* const PSession, CCharEntity* const PCh | |||
| { | |||
| case 0: // party | |||
| { | |||
| if (PChar->PParty != nullptr && PChar->PParty->GetLeader() == PChar) | |||
| if (PChar && PChar->PParty != nullptr && PChar->PParty->GetLeader() == PChar) | |||
There was a problem hiding this comment.
Same here, we can check PChar once before the switch and then continue afterwards with impunity
| @@ -1300,7 +1300,7 @@ void CZoneEntities::PushPacket(CBaseEntity* PEntity, GLOBAL_MESSAGE_TYPE message | |||
| case CHAR_INRANGE_SELF: // NOTE!!!: This falls through to CHAR_INRANGE so both self and the local area get the packet | |||
| { | |||
| TracyZoneCString("CHAR_INRANGE_SELF"); | |||
| if (PEntity->objtype == TYPE_PC) | |||
| if (PEntity && PEntity->objtype == TYPE_PC) | |||
There was a problem hiding this comment.
Theres part of a PEntity check in the GM section, but the PEntity check can go with or next to the packet check at the very start
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.
I affirm:
What does this pull request do?
Adds some nullness checking I found in a static code analysis
Steps to test these changes
Test things effected, see no change