github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-20 20:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reject bad folding meta data

Browse Source 
Fixes issue #866.
This commit is contained in:
Allan Odgaard
2013-03-05 16:42:22 +01:00
parent 840f0922c7
commit e8cd0b0df7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Frameworks/layout/src/folds.cc
View File

@@ -29,6 +29,8 @@ namespace ng
plist::any_t value = plist::parse_ascii(str);
if(plist::array_t const* array = boost::get<plist::array_t>(&value))
{
bool validRanges = true;
std::vector< std::pair<size_t, size_t> > newFoldings;
iterate(pair, *array)
{
@@ -36,11 +38,14 @@ namespace ng
{
int32_t const* from = value->size() == 2 ? boost::get<int32_t>(&(*value)[0]) : NULL;
int32_t const* to = value->size() == 2 ? boost::get<int32_t>(&(*value)[1]) : NULL;
if(from && to)
newFoldings.push_back(std::make_pair(*from, *to));
if(from && *from < _buffer.size() && to && *to < _buffer.size())
newFoldings.push_back(std::make_pair(*from, *to));
else validRanges = false;
}
}
set_folded(newFoldings);
if(validRanges)
set_folded(newFoldings);
}
}