Skip to content

Loading FIFF would crash with empty raw-data directory #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ag-fieldline wants to merge 1 commit into
base: staging
Choose a base branch
from
+10 −1
Open

Loading FIFF would crash with empty raw-data directory #1003

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/libraries/fiff/fiff_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1904,6 +1904,15 @@ bool FiffStream::setup_read_raw(QIODevice &p_IODevice,
fiff_int_t first_samp = 0;
fiff_int_t first_skip = 0;
//
// A malformed file may have a raw data block with an empty directory.
// Bail out cleanly instead of indexing past the end of dir below.
//
if (dir.isEmpty())
{
qWarning("No directory entries in raw data block of %s\n", t_sFileName.toUtf8().constData());
return false;
}
//
// Get first sample tag if it is there
//
FiffTag::UPtr t_pTag;
Expand All @@ -1916,7 +1925,7 @@ bool FiffStream::setup_read_raw(QIODevice &p_IODevice,
//
// Omit initial skip
//
if (dir[first]->kind == FIFF_DATA_SKIP)
if (first < dir.size() && dir[first]->kind == FIFF_DATA_SKIP)
{
//
// This first skip can be applied only after we know the buffer size
Expand Down