chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overrun in EDFParser.

Browse Source 
Signed-off-by: Mark Watkins <jedimark@users.sourceforge.net>
This commit is contained in:
Sean Stangl 2014-04-09 15:47:23 -07:00 committed by Mark Watkins
parent 6e07dfad4e
commit 50c51c9a91
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -80,19 +80,21 @@ EDFParser::~EDFParser()
}
qint16 EDFParser::Read16()
{
unsigned char *buf=(unsigned char *)buffer;
if (pos>=filesize) return 0;
qint16 res=*(qint16 *)&buf[pos];
//qint16 res=(buf[pos] ^128)<< 8 | buf[pos+1] ^ 128;
pos+=2;
if ((pos + sizeof(qint16)) > filesize)
return 0;
qint16 res = *(qint16 *)&buffer[pos];
pos += sizeof(qint16);
return res;
}
QString EDFParser::Read(int si)
QString EDFParser::Read(unsigned n)
{
if ((pos + n) > filesize)
return "";
QString str;
if (pos>=filesize) return "";
for (int i=0;i<si;i++) {
str+=buffer[pos++];
for (unsigned i = 0; i < n; i++) {
str += buffer[pos++];
}
return str.trimmed();
}

4
sleepyhead/SleepLib/loader_plugins/resmed_loader.h
View File

@ -116,8 +116,8 @@ public:
//! \brief Open the EDF+ file, and read it's header
bool Open(QString name);
//! \brief Read si bytes of 8 bit data from the EDF+ data stream
QString Read(int si);
//! \brief Read n bytes of 8 bit data from the EDF+ data stream
QString Read(unsigned n);
//! \brief Read 16 bit word of data from the EDF+ data stream
qint16 Read16();