upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 18:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid dereferencing NULL underlying configs from vconfig objects...

Browse Source 
...in the storyscreen WML resolver procedure.

Fixes bug #13601.
This commit is contained in:
Ignacio R. Morelle 2009-05-31 01:39:07 +00:00
parent 5c3e5b24f5
commit 1845ed4562
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -16,6 +16,7 @@ Version 1.7.0+svn:
* Miscellaneous and bugfixes: * Miscellaneous and bugfixes:
* Add strict compilation to cmake * Add strict compilation to cmake
* Let cmake also use the CXXFLAGS and CFLAGS environment variables * Let cmake also use the CXXFLAGS and CFLAGS environment variables
* Fixed a segmentation fault with storyscreens using [if]
Version 1.7.0: Version 1.7.0:
* AI: * AI:

3
players_changelog
View File

@ -14,6 +14,9 @@ Version 1.7.0+svn:
* User interface * User interface
* Improved the layout to take less space in certain cases. * Improved the layout to take less space in certain cases.
* Miscellaneous and bugfixes
* Fixed a crash in some storyscreens.
Version 1.7.0: Version 1.7.0:
* Campaigns * Campaigns
* Delfador's Memoirs: new campaign added to mainline (Novice level, * Delfador's Memoirs: new campaign added to mainline (Novice level,

4
src/storyscreen/part.cpp
View File

@ -164,6 +164,10 @@ part::TITLE_ALIGNMENT part::string_title_align(const std::string& s)
void part::resolve_wml(const vconfig& cfg, game_state& gamestate) void part::resolve_wml(const vconfig& cfg, game_state& gamestate)
{ {
if(cfg.null()) {
return;
}
if(cfg.has_attribute("background")) { if(cfg.has_attribute("background")) {
background_file_ = cfg["background"]; background_file_ = cfg["background"];
} }