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

fix a crash when filename is shorter than extension

Browse source
This commit is contained in:
Serge Martin 2006-11-07 12:16:48 +00:00
parent 575b47de80
commit 39973edc00
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/publish_campaign.cpp
View file

@ -71,25 +71,27 @@ std::vector<std::string> available_campaigns()
// Return a vector of detected scripts.
std::vector<config *> find_scripts(const config &cfg, std::string extension)
{
std::vector<config *> python_scripts;
const config::child_list& dirs = cfg.get_children("dir");
config::child_list::const_iterator i;
for(i = dirs.begin(); i != dirs.end(); ++i) {
const config::child_list& files = (**i).get_children("file");
config::child_list::const_iterator j;
for(j = files.begin(); j != files.end(); ++j) {
std::string filename = (**j)["name"].str();
if (filename.substr(filename.length() - extension.length()) ==
extension) {
python_scripts.push_back(*j);
}
}
// Recursively look for files in sub directories.
std::vector<config *> childs = find_scripts(**i, extension);
python_scripts.insert(python_scripts.end(),
childs.begin(), childs.end());
}
return python_scripts;
std::vector<config *> python_scripts;
const config::child_list& dirs = cfg.get_children("dir");
config::child_list::const_iterator i;
for(i = dirs.begin(); i != dirs.end(); ++i) {
const config::child_list& files = (**i).get_children("file");
config::child_list::const_iterator j;
for(j = files.begin(); j != files.end(); ++j) {
std::string filename = (**j)["name"].str();
if (filename.length() > extension.length()) {
if (filename.substr(filename.length() - extension.length()) ==
extension) {
python_scripts.push_back(*j);
}
}
}
// Recursively look for files in sub directories.
std::vector<config *> childs = find_scripts(**i, extension);
python_scripts.insert(python_scripts.end(),
childs.begin(), childs.end());
}
return python_scripts;
}
namespace {

2
src/unit.cpp
View file

@ -1901,7 +1901,7 @@ void unit::redraw_unit(display& disp,gamemap::location hex)
surface image(image::get_image(loc,
utils::string_bool(get_state("stoned"))?image::GREYED : image::UNSCALED,image::ADJUST_COLOUR,
state_ == STATE_STANDING?true:false));
if(image ==NULL) {
if(image == NULL) {
image = still_image();
}
#ifndef LOW_MEM