[PATCH 2/4] CSV import: validate column count

Miika Turkia miika.turkia at gmail.com
Sun Sep 6 11:40:13 PDT 2015


We need at least 23 columns when reading in Subsurface CSV.

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 qt-ui/divelogimportdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 49b6817..c21a6a1 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -583,7 +583,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
 			headers.replace(CSVApps[value].setpoint, tr("Sample setpoint"));
 
 		/* Show the Subsurface CSV column headers */
-		if (value == SUBSURFACE) {
+		if (value == SUBSURFACE && currColumns.count() >= 23) {
 			headers.replace(0, tr("Dive #"));
 			headers.replace(1, tr("Date"));
 			headers.replace(2, tr("Time"));
-- 
2.1.4



More information about the subsurface mailing list