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

Fixed segfault at (auto)save time.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-08-31 06:04:05 +00:00
parent 61c5c00388
commit 15be48373c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/config.cpp
View file

@ -452,11 +452,12 @@ void config::splice_children(config &src, const std::string &key)
src.ordered_children.end());
child_list &dst = children[key];
child_map::iterator i_dst = children.find(key);
unsigned before = dst.size();
dst.insert(dst.end(), i_src->second.begin(), i_src->second.end());
src.children.erase(i_src);
// key might be a reference to i_src->first, so it is no longer usable.
child_map::iterator i_dst = children.find(key);
for (unsigned j = before; j < dst.size(); ++j) {
ordered_children.push_back(child_pos(i_dst, j));
}