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

editor: don't allow bad location id strings

Browse source 
in particular using spaces or commas here results in invalid map files when the map is written to disk. (repoted on the forum)
This commit is contained in:
gfgtdf 2018-05-07 21:23:22 +02:00 • committed by GitHub
parent 500f510102
commit 9cb36be8ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/editor/palette/location_palette.cpp
View file

@ -21,11 +21,15 @@
#include "font/standard_colors.hpp"
#include "tooltips.hpp"
#include "editor/editor_common.hpp"
#include "editor/toolkit/editor_toolkit.hpp"
#include "gui/dialogs/edit_text.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "formula/string_utils.hpp"
#include <boost/regex.hpp>
static bool is_positive_integer(const std::string& str) {
return str != "0" && std::find_if(str.begin(), str.end(), [](char c) { return !std::isdigit(c); }) == str.end();
}
@ -259,7 +263,18 @@ void location_palette::adjust_size(const SDL_Rect& target)
button_add_.reset(new location_palette_button(video(), SDL_Rect{ target.x , bottom -= button_y, target.w - 10, button_height }, _("Add"), [this]() {
std::string newid;
if (gui2::dialogs::edit_text::execute(_("New Location Identifier"), "", newid)) {
add_item(newid);
static const boost::regex valid_id("[a-zA-Z_]+");
if(boost::regex_match(newid, valid_id)) {
add_item(newid);
}
else {
gui2::show_transient_message(
_("Error"),
_("Invalid location id")
);
//TODO: a user visible messae would be nice.
ERR_ED << "entered invalid location id\n";
}
}
}));
button_delete_.reset(new location_palette_button(video(), SDL_Rect{ target.x , bottom -= button_y, target.w - 10, button_height }, _("Delete"), nullptr));