OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-12 00:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Guard access of error text pointer in CsvUserDataParser

Browse Source
This commit is contained in:
Jacob Støren 2018-08-13 16:13:31 +02:00
parent 8b14a01a2b
commit c6069ade29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -222,7 +222,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
// Parse header // Parse header
if (!parseColumnInfo(dataStream, parseOptions, &columnInfoList)) if (!parseColumnInfo(dataStream, parseOptions, &columnInfoList))
{ {
m_errorText->append("CSV import: Failed to parse header columns"); if (m_errorText) m_errorText->append("CSV import: Failed to parse header columns");
return false; return false;
} }
@ -236,7 +236,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
if(lineColumns.size() != colCount) if(lineColumns.size() != colCount)
{ {
m_errorText->append("CSV import: Varying number of columns"); if (m_errorText) m_errorText->append("CSV import: Varying number of columns");
errors = true; errors = true;
break; break;
} }
@ -290,7 +290,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
// Find the error reason, wrong decimal sign or something else // Find the error reason, wrong decimal sign or something else
if (RiaStdStringTools::isNumber(colData.toStdString(), '.') || RiaStdStringTools::isNumber(colData.toStdString(), ',')) if (RiaStdStringTools::isNumber(colData.toStdString(), '.') || RiaStdStringTools::isNumber(colData.toStdString(), ','))
{ {
m_errorText->append(QString("CSV import: Failed to parse numeric value in column %1\n").arg(QString::number(iCol + 1))); if (m_errorText) m_errorText->append(QString("CSV import: Failed to parse numeric value in column %1\n").arg(QString::number(iCol + 1)));
throw 0; throw 0;
} }
@ -323,7 +323,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
if (!dt.isValid()) if (!dt.isValid())
{ {
m_errorText->append("CSV import: Failed to parse date time value"); if (m_errorText) m_errorText->append("CSV import: Failed to parse date time value");
throw 0; throw 0;
} }
col.dateTimeValues.push_back(dt); col.dateTimeValues.push_back(dt);