From 3077d4be403dd22b8cc4c33b9e480c9fb2042087 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 2 Apr 2015 23:28:52 -0500 Subject: [PATCH] fix a couple of the obvious ones --- engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp | 2 ++ engine/shared/library/sharedImage/src/shared/TargaFormat.cpp | 2 ++ .../library/sharedTemplateDefinition/src/shared/core/File.cpp | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp b/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp index 6f1cc6ca..ae3cf2c9 100644 --- a/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp +++ b/engine/shared/library/sharedDebug/src/linux/DebugMonitor.cpp @@ -212,6 +212,8 @@ void DebugMonitor::install(void) // Allow translation of arrow keys. if (keypad(s_outputWindow, true) == ERR) { + fclose(s_ttyOutputFile); + fclose(s_ttyInputFile); DEBUG_WARNING(true, ("DebugMonitor: keypad() failed [%s].", strerror(errno))); return; } diff --git a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp index 26eb770b..e68a9d3d 100644 --- a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp +++ b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp @@ -1231,6 +1231,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(destPixelsLine, destYStride, 1, f); if (numWritten!=1) { + fclose(f); DEBUG_WARNING(true, ("Targa image data not written successfully for %s\n", filename)); return false; } @@ -1245,6 +1246,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) numWritten = fwrite(piter, sourceYStride, 1, f); if (numWritten!=1) { + fclose(f); DEBUG_WARNING(true, ("Targa image data not written successfully for %s\n", filename)); return false; } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp index 35d9a1b4..d3b0322d 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp @@ -184,7 +184,9 @@ int File::print(const char *format, ...) va_list argptr; va_start(argptr, format); - return vfprintf(m_fp, format, argptr); + int ret = vfprintf(m_fp, format, argptr); va_end(argptr); + + return ret; } // File::print