0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make get_current_track_index safer to use

Browse source 
This prevents problems like issue #1861.
This commit is contained in:
Alexander van Gessel 2017-10-30 21:17:04 +01:00
parent e0efa082d7
commit 749646a75b
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scripting/lua_audio.cpp
View file

@ -96,11 +96,11 @@ static int impl_music_get(lua_State* L) {
} }
if(strcmp(m, "current_i") == 0) { if(strcmp(m, "current_i") == 0) {
size_t i = sound::get_current_track_index(); auto current_index = sound::get_current_track_index();
if(i >= sound::get_num_tracks()) { if(current_index) {
lua_pushnil(L); lua_pushinteger(L, current_index.value() + 1);
} else { } else {
lua_pushinteger(L, i + 1); lua_pushnil(L);
} }
return 1; return 1;
} }

5
src/sound.cpp
View file

@ -191,8 +191,11 @@ std::vector<std::shared_ptr<sound::music_track>>::const_iterator find_track(cons
namespace sound namespace sound
{ {
unsigned int get_current_track_index() boost::optional<unsigned int> get_current_track_index()
{ {
if(current_track_index >= current_track_list.size()){
return {};
}
return current_track_index; return current_track_index;
} }
std::shared_ptr<music_track> get_current_track() std::shared_ptr<music_track> get_current_track()

3
src/sound.hpp
View file

@ -17,6 +17,7 @@
#include "events.hpp" #include "events.hpp"
#include "sound_music_track.hpp" #include "sound_music_track.hpp"
#include <boost/optional.hpp>
#include <string> #include <string>
class config; class config;
@ -104,7 +105,7 @@ void set_sound_volume(int vol);
void set_bell_volume(int vol); void set_bell_volume(int vol);
void set_UI_volume(int vol); void set_UI_volume(int vol);
unsigned int get_current_track_index(); // This function may return a value >= get_num_tracks(). Use with caution boost::optional<unsigned int> get_current_track_index();
std::shared_ptr<sound::music_track> get_current_track(); std::shared_ptr<sound::music_track> get_current_track();
std::shared_ptr<sound::music_track> get_previous_music_track(); std::shared_ptr<sound::music_track> get_previous_music_track();
void set_previous_track(std::shared_ptr<music_track>); void set_previous_track(std::shared_ptr<music_track>);