Skip to content

Fix array overflow error #205

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

Merged
merged 1 commit into from
Dec 30, 2018
Merged

Fix array overflow error #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/game/mc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ struct MisEval Mev[60]; // was *Mev;
struct mStr Mis;
REPLAY Rep;

char pCnt, tMen; // Counter for pAry
int pAry[15]; // Array for Presige Firsts compelted
char tMen;

char MANNED[2];
char CAP[2];
Expand Down Expand Up @@ -117,8 +116,6 @@ int Launch(char plr, char mis)
int i, j, t, k, mcode, avg, temp = 0;
char total;
STEP = FINAL = JOINT = PastBANG = 0;
memset(pAry, 0x00, sizeof pAry);
pCnt = 0; // reset values
MisStat = tMen = 0x00; // clear mission status flags

remove_savedat("REPLAY.TMP"); // make sure replay buffer isn't there
Expand Down
7 changes: 1 addition & 6 deletions src/game/mis_m.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ char InSpace;
char Dock_Skip; /**< used for mission branching */

extern uint16_t MisStat;
extern char pCnt, tMen; // Counter for pAry
extern char tMen;
extern bool fullscreenMissionPlayback;
extern int pAry[15]; /**< Array for Presige Firsts compelted */

void Tick(char);

Expand Down Expand Up @@ -522,10 +521,6 @@ void MisCheck(char plr, char mpad)
delay(20);
}

if (Mev[STEP].Prest != 0) {
pAry[pCnt++] = STEP;
}

if (Mev[STEP].sgoto == Mev[STEP].fgoto && Mev[STEP].trace != 0x7f) {
Mev[STEP].trace = Mev[STEP].sgoto;
}
Expand Down