Skip to content

CSVExportFilter: check for valid filename before opening, check for valid FILE* handle before using it #1079

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
timp3289 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CSVExportFilter: check for valid filename before opening, check for valid FILE* handle before using it #1079

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
17 changes: 15 additions & 2 deletions scopeprotocols/CSVExportFilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,24 @@ void CSVExportFilter::Export()
{
auto mode = static_cast<ExportMode_t>(m_parameters[m_mode].GetIntVal());

string filename = m_parameters[m_fname].GetFileName();
if(filename.empty()){
AddErrorMessage("Output file","CSV Output filename is blank");
return;
}


bool append = (mode == MODE_CONTINUOUS_APPEND) || (mode == MODE_MANUAL_APPEND);
if(append)
m_fp = fopen(m_parameters[m_fname].GetFileName().c_str(), "ab");
m_fp = fopen(filename.c_str(), "ab");
else
m_fp = fopen(m_parameters[m_fname].GetFileName().c_str(), "wb");
m_fp = fopen(filename.c_str(), "wb");

if(!m_fp){
AddErrorMessage("I/O error","Error opening file: "+filename);
LogError("CSVExportFilter: fopen() returned null trying to open file %s\n",filename.c_str());
return;
}

//See if file is empty. If so, write header
fseek(m_fp, 0, SEEK_END);
Expand Down