- Fixed bug #1016, which caused segfaults when importing JSON with annotations
  that lack description or entry date (thanks to Nicholas Rabenau).
This commit is contained in:
Paul Beckingham 2012-06-10 15:03:56 -04:00
parent 3e36438597
commit 128b139b17
4 changed files with 11 additions and 0 deletions

View file

@ -172,6 +172,12 @@ int CmdImport::execute (std::string& output)
json::string* when = (json::string*)annotation->_data["entry"];
json::string* what = (json::string*)annotation->_data["description"];
if (! when)
throw format (STRING_CMD_IMPORT_NO_ENTRY, *line);
if (! what)
throw format (STRING_CMD_IMPORT_NO_DESC, *line);
std::string name = "annotation_" + Date (when->_data).toEpochString ();
annos.insert (std::make_pair (name, what->_data));