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

Merge

Browse source 
- Fixed segmentation fault if undo.data is empty
This commit is contained in:
Johannes Schlatow 2010-09-02 01:24:58 +02:00
parent 87ce13c8e0
commit d362088305
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/TDB.cpp
View file

@ -1111,8 +1111,10 @@ void TDB::merge (const std::string& mergeFile)
rit = r.begin ();
lit = l.begin ();
rline = *rit;
lline = *lit;
if (rit != r.end())
rline = *rit;
if (lit != l.end())
lline = *lit;
///////////////////////////////////////
// find the branch-off point: