Improve TeamsInfoRec::Add_Team function #638
Open
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
xezon
force-pushed
the
fix-errors-07-addteam
branch
from
93ab2f0
to
915bd55
Compare
xezon
force-pushed
the
fix-errors-07-addteam
branch
2 times, most recently
from
e02f9f7
to
8894060
Compare
xezon
force-pushed
the
fix-errors-07-addteam
branch
from
8894060
to
73be557
Compare
xezon
commented
Jun 16, 2022
| @@ -30,36 +30,31 @@ TeamsInfoRec::~TeamsInfoRec() | |||
| */ | |||
| void TeamsInfoRec::Add_Team(const Dict *team) | |||
| { | |||
| captainslog_dbgassert(m_numTeams < 2048, "%d teams have been allocated (so far). This seems excessive.", m_numTeams); | |||
There was a problem hiding this comment.
As seen in world builder
| // If we have too many teams for our current allocation to handle, reallocate more. | ||
| if (m_numTeams >= m_numTeamsAllocated) { | ||
| TeamsInfo *ti = new TeamsInfo[m_numTeamsAllocated + TEAMINFO_GROWTH_STEP]; | ||
| const int allocsz = m_numTeamsAllocated + TEAMINFO_GROWTH_STEP; | ||
| captainslog_assert(m_numTeams < allocsz); |
There was a problem hiding this comment.
Added this assert for good measure.
|
|
||
| // Copy existing data across to new array. | ||
| int i; | ||
| for (i = 0; i < m_numTeams; ++i) { | ||
| int i = 0; |
There was a problem hiding this comment.
This helped avoid complaint from static analyzer I think.
| m_teams = ti; | ||
| m_numTeamsAllocated += TEAMINFO_GROWTH_STEP; | ||
| } | ||
|
|
||
| m_teams[m_numTeams].Clear(); |
There was a problem hiding this comment.
This and the test are removed, because it already happens inside the Init function called below.
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.
Static analyzer still warns about
m_teams[m_numTeams++].Init(team);buffer overrun but algorithm looks ok to me.