forgot to close file in @natir is_fastq

Author: dridk

analysis/analysisrunner.cpp

@@ -61,30 +61,30 @@ void AnalysisRunner::run()
 
     QFileInfo fileInfo(mFilename);
 
-    QFile * compressFile = new QFile(mFilename);
-    QIODevice * file = new QFile(mFilename);
+    QIODevice * file    = Q_NULLPTR;
+    QIODevice * rawFile = new QFile(mFilename);
 
-    if (is_gz(file))
+    if (is_gz(rawFile))
     {
-        file = new KCompressionDevice(compressFile,true,KCompressionDevice::GZip);
+        file = new KCompressionDevice(rawFile,true,KCompressionDevice::GZip);
         if (!is_fastq(file))
             file = Q_NULLPTR;
     }
-    else if (is_bz2(file))
+    else if (is_bz2(rawFile))
     {
-        file = new KCompressionDevice(compressFile, true, KCompressionDevice::BZip2);
+        file = new KCompressionDevice(rawFile, true, KCompressionDevice::BZip2);
         if (!is_fastq(file))
             file = Q_NULLPTR;
     }
-    else if (is_xz(file))
+    else if (is_xz(rawFile))
     {
-        file = new KCompressionDevice(compressFile,true, KCompressionDevice::Xz);
+        file = new KCompressionDevice(rawFile,true, KCompressionDevice::Xz);
         if (!is_fastq(file))
             file = Q_NULLPTR;
     }
-    else if (is_fastq(file))
+    else if (is_fastq(rawFile))
     {
-        file = new QFile(mFilename);
+        file = rawFile;
     }
 
     if (file == Q_NULLPTR)
@@ -132,7 +132,7 @@ void AnalysisRunner::run()
             // this is critcal and can decrease the speed. Send message only 1 sequence / 1000
             if (mSequenceCount % 1000 == 0)
             {
-                int percentNow = (float)(compressFile->pos()) / fileInfo.size() * 100;
+                int percentNow = (float)(rawFile->pos()) / fileInfo.size() * 100;
                 // if percentNow is still null, return empty percent ...
                 if ( (percentNow >= mProgression + 5) || (percentNow == 0))
                 {

utils/format_detection.cpp

@@ -92,8 +92,10 @@ bool is_fastq(QIODevice* file)
 
         line = file->readLine();
         // Some not alphabetic caractere are in range but you know isn't a problem
-        if (line[0] < 'A' || line[0] > 'z')
+        if (line[0] < 'A' || line[0] > 'z'){
+            file->close();
             return false;
+        }
 
         line = file->readLine();
         if (line[0] != '+')
@@ -103,11 +105,14 @@ bool is_fastq(QIODevice* file)
         }
 
         line = file->readLine();
-        if (line[0] < '!' || line[0] > '~')
+        if (line[0] < '!' || line[0] > '~'){
+            file->close();
             return false;
-
+        }
+        file->close();
         return true;
     }
+
     else
     {
         return false;