Add missing QFile::close where a file has been opened.

And move some closer to the open call to make sure it happens when the scope ends.
MrStevns · Nov 24, 2024 · bb18358 · bb18358
1 parent 3447d67
commit bb18358
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/core_lib/src/graphics/vector/vectorimage.cpp b/core_lib/src/graphics/vector/vectorimage.cpp
@@ -82,6  82,9 @@ bool VectorImage::read(QString filePath)
     {
         return false;
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     QDomDocument doc;
     if (!doc.setContent(&file)) return false; // this is not a XML file
@@ -123,6  126,9 @@ Status VectorImage::write(QString filePath, QString format)
         debugInfo << ("file.error() = "   file.errorString());
         return Status(Status::FAIL, debugInfo);
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     if (format != "VEC")
     {

diff --git a/core_lib/src/soundplayer.cpp b/core_lib/src/soundplayer.cpp
@@ -41,6  41,10 @@ void SoundPlayer::init(SoundClip* clip)
 
     QFile file(clip->fileName());
     file.open(QIODevice::ReadOnly);
     ScopeGuard fileScope([&] {
         file.close();
     });
 
 
     mBuffer.setData(file.readAll());
     mBuffer.open(QBuffer::ReadOnly);

diff --git a/core_lib/src/structure/filemanager.cpp b/core_lib/src/structure/filemanager.cpp
@@ -114,6  114,10 @@ Object* FileManager::load(const QString& sFileName)
         handleOpenProjectError(Status::ERROR_FILE_CANNOT_OPEN, dd);
         return nullptr;
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     dd << "Main XML exists: Yes";
 
     QDomDocument xmlDoc;
@@ -933,6  937,9 @@ Status FileManager::rebuildMainXML(Object* object)
     {
         return Status::ERROR_FILE_CANNOT_OPEN;
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     QDomDocument xmlDoc("PencilDocument");
     QDomElement root = xmlDoc.createElement("document");
@@ -957,7  964,6 @@ Status FileManager::rebuildMainXML(Object* object)
     QTextStream fout(&file);
     xmlDoc.save(fout, 2);
     fout.flush();
-    file.close();
 
     return Status::OK;
 }

diff --git a/core_lib/src/structure/object.cpp b/core_lib/src/structure/object.cpp
@@ -519,13  519,15 @@ bool Object::exportPalette(const QString& filePath) const
         qDebug("Error: cannot export palette");
         return false;
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     if (file.fileName().endsWith(".gpl", Qt::CaseInsensitive))
         exportPaletteGPL(file);
     else
         exportPalettePencil(file);
 
-    file.close();
     return true;
 }
 
@@ -665,14  667,16 @@ bool Object::importPalette(const QString& filePath)
     {
         return false;
     }
     ScopeGuard fileScope([&] {
         file.close();
     });
 
     if (file.fileName().endsWith(".gpl", Qt::CaseInsensitive))
     {
         importPaletteGPL(file);
     } else {
         importPalettePencil(file);
     }
-    file.close();
     return true;
 }