ardour/livetrax
13
0
Fork 0
Code

Use XMLNode::get_property in Session::restore_history

Browse Source 
Avoid using std::stringstream due to potential future issues with C++ locale.

Also avoids potential NULL pointer dereferences.
This commit is contained in:
Tim Mayberry 2017-04-19 22:21:03 +10:00
parent d19ec8ba46
commit 384478a745
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ardour/session_state.cc
View File

@ -3823,13 +3823,21 @@ Session::restore_history (string snapshot_name)
XMLNode *t = *it;
UndoTransaction* ut = new UndoTransaction ();
struct timeval tv;
ut->set_name(t->property("name")->value());
stringstream ss(t->property("tv-sec")->value());
ss >> tv.tv_sec;
ss.str(t->property("tv-usec")->value());
ss >> tv.tv_usec;
std::string name;
int64_t tv_sec;
int64_t tv_usec;
if (!t->get_property ("name", name) || !t->get_property ("tv-sec", tv_sec) ||
!t->get_property ("tv-usec", tv_usec)) {
continue;
}
ut->set_name (name);
struct timeval tv;
tv.tv_sec = tv_sec;
tv.tv_usec = tv_usec;
ut->set_timestamp(tv);
for (XMLNodeConstIterator child_it = t->children().begin();