Skip to content
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

Jump to bottom

Add sanity checks to all LCF data structure access #1259

Merged
merged 15 commits into from Jan 2, 2018
Merged

Add sanity checks to all LCF data structure access #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6a98d15
Add sanity checks to all LCF data structure access to reduce crashes …
Ghabry Aug 26, 2017
67bbe04
Reword some interpreter warnings. Handle callstack limit.
Ghabry Sep 9, 2017
fc41741
Fix sanity check mistakes. Add additional checks and comments.
Ghabry Sep 20, 2017
bbac6fa
Change reader_util include and improve warnings
Ghabry Sep 23, 2017
4dee0a6
Validate actors returned from GetActor.
Ghabry Nov 4, 2017
01d4515
Adopt sanity checks to latest BattleCommand changes
Ghabry Nov 26, 2017
cf5379f
Use zero-based index for Game_Actors to be consistent with the sanity…
Ghabry Nov 26, 2017
d7869be
Fix style and code problems in sanity check.
Ghabry Nov 26, 2017
d51ce72
Add exception in the sanity check and special handling for Level 0 wh…
Ghabry Nov 29, 2017
8cd480c
Fix a crash caused by the RPG2k3 1.12 picture code when F12 is presse…
Ghabry Nov 29, 2017
b10fc91
Remove 2nd state sanity check. Due to how the state array is designed…
Ghabry Dec 5, 2017
bb06cb4
Fix incorrect index usage in Window ShopBuy
Ghabry Dec 6, 2017
7be4595
Fix crash that happens when the last BGM failed to load and the Playe…
Ghabry Dec 6, 2017
63c5112
Battle system: Fix out-of-bounds read when a battle charset is used a…
Ghabry Dec 7, 2017
69e2bf7
Fix regression that prevented deletion of the items when a new game s…
Ghabry Jan 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/audio_generic.cpp
View file
Open in desktop
Expand Up @@ -67,13 +67,17 @@ void GenericAudio::BGM_Play(const std::string& file, int volume, int pitch, int

void GenericAudio::BGM_Pause() {
for (unsigned i = 0; i < nr_of_bgm_channels; i++) {
BGM_Channels[i].paused = true;
if (BGM_Channels[i].decoder) {
BGM_Channels[i].paused = true;
}
}
}

void GenericAudio::BGM_Resume() {
for (unsigned i = 0; i < nr_of_bgm_channels; i++) {
BGM_Channels[i].paused = false;
if (BGM_Channels[i].decoder) {
BGM_Channels[i].paused = false;
}
}
}

Expand Down Expand Up @@ -195,6 +199,7 @@ bool GenericAudio::PlayOnChannel(BgmChannel& chan, const std::string& file, int
return true;
} else {
Output::Warning("Couldn't play BGM %s. Format not supported", FileFinder::GetPathInsideGamePath(file).c_str());
chan.decoder.reset();
fclose(filehandle);
}

Expand Down
29 changes: 18 additions & 11 deletions src/background.cpp
View file
Open in desktop
Expand Up @@ -25,6 +25,8 @@
#include "background.h"
#include "bitmap.h"
#include "main_data.h"
#include "reader_util.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other places use quotes for liblcf includes. (1)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed all your notes except this one because it already uses quotes

#include "output.h"

Background::Background(const std::string& name) :
visible(true),
Expand All @@ -47,33 +49,38 @@ Background::Background(int terrain_id) :

Graphics::RegisterDrawable(this);

const RPG::Terrain& terrain = Data::terrains[terrain_id - 1];
const RPG::Terrain* terrain = ReaderUtil::GetElement(Data::terrains, terrain_id);

if (!terrain) {
Output::Warning("Background: Invalid terrain ID %d", terrain_id);
return;
}

// Either background or frame
if (terrain.background_type == RPG::Terrain::BGAssociation_background && !terrain.background_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Backdrop", terrain.background_name);
if (terrain->background_type == RPG::Terrain::BGAssociation_background && !terrain->background_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Backdrop", terrain->background_name);
request_id = request->Bind(&Background::OnBackgroundGraphicReady, this);
request->Start();
return;
}

// Frame
if (!terrain.background_a_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Frame", terrain.background_a_name);
if (!terrain->background_a_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Frame", terrain->background_a_name);
request_id = request->Bind(&Background::OnBackgroundGraphicReady, this);
request->Start();

bg_hscroll = terrain.background_a_scrollh ? terrain.background_a_scrollh_speed : 0;
bg_vscroll = terrain.background_a_scrollv ? terrain.background_a_scrollv_speed : 0;
bg_hscroll = terrain->background_a_scrollh ? terrain->background_a_scrollh_speed : 0;
bg_vscroll = terrain->background_a_scrollv ? terrain->background_a_scrollv_speed : 0;
}

if (terrain.background_b && !terrain.background_b_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Frame", terrain.background_b_name);
if (terrain->background_b && !terrain->background_b_name.empty()) {
FileRequestAsync* request = AsyncHandler::RequestFile("Frame", terrain->background_b_name);
request_id = request->Bind(&Background::OnForegroundFrameGraphicReady, this);
request->Start();

fg_hscroll = terrain.background_b_scrollh ? terrain.background_b_scrollh_speed : 0;
fg_vscroll = terrain.background_b_scrollv ? terrain.background_b_scrollv_speed : 0;
fg_hscroll = terrain->background_b_scrollh ? terrain->background_b_scrollh_speed : 0;
fg_vscroll = terrain->background_b_scrollv ? terrain->background_b_scrollv_speed : 0;
}
}

Expand Down