From 7e15c2a7ad89430e023d9bae9250d7a42f8ab4e9 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 11 Apr 2016 11:36:31 -0700 Subject: Fix seabear import sample overrun bug The Seabear import fixed up the NDL and TTS in the samples from minutes (in the import) to seconds (our internal format for all time). But it did it with a loop that overran the end of the samples array by one: for(int s_nr = 0 ; s_nr <= dive->dc.samples ; s_nr++) { Fix it to use the proper "<" instead of "<=". Reported-by: Stuart Vernon Tested-by: Miika Turkia Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/divelogimportdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-ui/divelogimportdialog.cpp') diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index 67faadf91..26d38788c 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -774,7 +774,7 @@ void DiveLogImportDialog::on_buttonBox_accepted() } // Seabear CSV stores NDL and TTS in Minutes, not seconds struct dive *dive = dive_table.dives[dive_table.nr - 1]; - for(int s_nr = 0 ; s_nr <= dive->dc.samples ; s_nr++) { + for(int s_nr = 0 ; s_nr < dive->dc.samples ; s_nr++) { struct sample *sample = dive->dc.sample + s_nr; sample->ndl.seconds *= 60; sample->tts.seconds *= 60; -- cgit v1.2.3-70-g09d2