Commit a4003db4 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 735587 - [PATCH] Fix a terminating null character after fread in src/filedef.cpp

parent c4007c3a
...@@ -1657,16 +1657,19 @@ void FileDef::acquireFileVersion() ...@@ -1657,16 +1657,19 @@ void FileDef::acquireFileVersion()
} }
const int bufSize=1024; const int bufSize=1024;
char buf[bufSize]; char buf[bufSize];
int numRead = (int)fread(buf,1,bufSize,f); int numRead = (int)fread(buf,1,bufSize-1,f);
portable_pclose(f); portable_pclose(f);
if (numRead>0 && !(m_fileVersion=QCString(buf,numRead).stripWhiteSpace()).isEmpty()) if (numRead>0 && numRead<bufSize)
{ {
msg("%s\n",m_fileVersion.data()); buf[numRead]='\0';
} m_fileVersion=QCString(buf,numRead).stripWhiteSpace();
else if (!m_fileVersion.isEmpty())
{ {
msg("no version available\n"); msg("%s\n",m_fileVersion.data());
return;
}
} }
msg("no version available\n");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment