ardour/livetrax
13
0
Fork 0
Code

fix recent session loading.

Browse Source 
std::stringstream::operator<< calls strlen(), but the string in the
temp buffer may not [yet] be NULL terminated.
This commit is contained in:
Robin Gareus 2015-09-10 17:34:59 +02:00
parent b7fbd4e9c0
commit 8d54a2472d
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/recent_sessions.cc
View File

@ -61,27 +61,22 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
}
}
// Read the file into a std::string;
// Read the file into a std::string
std::stringstream recent;
char temporaryBuffer[1024];
while (!feof(fin))
{
size_t charsRead = fread(&temporaryBuffer[0], sizeof(char), 1024, fin);
if (charsRead != 1024 && ferror(fin))
{
while (!feof (fin)) {
char buf[1024];
size_t charsRead = fread (buf, sizeof(char), 1024, fin);
if (ferror (fin)) {
error << string_compose (_("Error reading recent session file %1 (%2)"), path, strerror (errno)) << endmsg;
fclose(fin);
return -1;
}
recent << &temporaryBuffer[0];
if (charsRead == 0) {
break;
}
recent.write (buf, charsRead);
}
//ifstream recent (fin);
while (true) {
pair<string,string> newpair;