From e3c03401c80b23d3e8cc67ffbf0efcd5885e556d Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 4 Dec 2018 19:58:24 +0100 Subject: [PATCH] PyBullet: fixed a few more file leaks --- examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp | 1 + examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h | 2 +- .../plugins/eglPlugin/eglRendererVisualShapeConverter.cpp | 1 + .../tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp b/examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp index bf5a39002..2f550e254 100644 --- a/examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp +++ b/examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp @@ -591,6 +591,7 @@ void LoadMeshFromCollada(const char* relativeFileName, btAlignedObjectArrayfileClose(fileHandle); } if (xmlString.size()==0) return; diff --git a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h index b9e3bed5e..53331e147 100644 --- a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h +++ b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h @@ -1,4 +1,3 @@ - #ifndef LOAD_MESH_FROM_STL_H #define LOAD_MESH_FROM_STL_H @@ -46,6 +45,7 @@ static GLInstanceGraphicsShape* LoadMeshFromSTL(const char* relativeFileName, st if (expectedBinaryFileSize != size) { delete[] memoryBuffer; + fileIO->fileClose(fileHandle); return 0; } } diff --git a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp index 0eca8b221..76910fe14 100644 --- a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp @@ -1361,6 +1361,7 @@ int EGLRendererVisualShapeConverter::loadTextureFile(const char* filename, struc buffer.resize(0); } } + fileIO->fileClose(fileId); } if (buffer.size()) { diff --git a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp index e3b5d7992..d9d8eb203 100644 --- a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp @@ -1270,6 +1270,7 @@ int TinyRendererVisualShapeConverter::loadTextureFile(const char* filename, stru buffer.resize(0); } } + fileIO->fileClose(fileId); } if (buffer.size()) {