GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

TW-1678: segfault in ~ViewTask()

Browse source 
- Column::setStyle now validates column styles.
- Thanks to Daniel Shahaf.
This commit is contained in:
Paul Beckingham 2015-09-09 23:39:51 -04:00
parent cb011026aa
commit 93e6ef5fb9
4 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/columns/ColDue.cpp
View file

@ -52,7 +52,7 @@ ColumnDue::~ColumnDue ()
// Note that you can not determine which gets called first.
void ColumnDue::setStyle (const std::string& value)
{
_style = value;
Column::setStyle (value);
if (_style == "countdown" && _label == STRING_COLUMN_LABEL_DUE)
_label = STRING_COLUMN_LABEL_COUNT;

10
src/columns/Column.cpp
View file

@ -247,6 +247,16 @@ void Column::renderHeader (
}
}
////////////////////////////////////////////////////////////////////////////////
void Column::setStyle (const std::string& style)
{
if (style != "default" &&
std::find (_styles.begin (), _styles.end (), style) == _styles.end ())
throw format (STRING_COLUMN_BAD_FORMAT, _name, style);
_style = style;
}
////////////////////////////////////////////////////////////////////////////////
bool Column::validate (std::string& input)
{

2
src/columns/Column.h
View file

@ -53,7 +53,7 @@ public:
std::vector <std::string> styles () const { return _styles; }
std::vector <std::string> examples () const { return _examples; }
virtual void setStyle (const std::string& value) { _style = value; }
virtual void setStyle (const std::string&);
virtual void setLabel (const std::string& value) { _label = value; }
virtual void setReport (const std::string& value) { _report = value; }