From 8c2ae2a0ab9ff8765e3cdcccaaf92574c967bf83 Mon Sep 17 00:00:00 2001 From: David Baer Date: Wed, 21 Apr 2021 22:14:33 -0400 Subject: [PATCH] Fix small memory leak --- CMakeLists.txt | 2 +- src/grid.h | 1 + src/image.c | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7a6660..ced0c71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,6 +32,6 @@ set( CACHE INTERNAL "tarball basename" ) set(CPACK_SOURCE_GENERATOR "TGZ") -set(CPACK_SOURCE_IGNORE_FILES "/.git/;.gitignore;.tar.gz$;/Makefile;/CMakeCache.txt;/CMakeFiles/;cmake_install.cmake;install_manifest.txt;/_CPack;/mazemaker$;/config.h$;.cmake$;${CPACK_SOURCE_IGNORE_FILES}") +set(CPACK_SOURCE_IGNORE_FILES "*.png;/logs/;/.git/;.gitignore;.tar.gz$;/Makefile;/CMakeCache.txt;/CMakeFiles/;cmake_install.cmake;install_manifest.txt;/_CPack;/mazemaker$;/config.h$;.cmake$;${CPACK_SOURCE_IGNORE_FILES}") include(CPack) diff --git a/src/grid.h b/src/grid.h index 64f4649..71fbf73 100644 --- a/src/grid.h +++ b/src/grid.h @@ -2,6 +2,7 @@ #define _GRID_H 1 #include +#include typedef uint8_t edgeweight_t; diff --git a/src/image.c b/src/image.c index 4b0232a..b2a3ff6 100644 --- a/src/image.c +++ b/src/image.c @@ -135,7 +135,10 @@ int writePNG(mazegrid_t const* g, char const* filename) { exit: if (f != NULL) fclose(f); - if (info_ptr != NULL) png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); + if (info_ptr != NULL) { + png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); + png_destroy_info_struct(png_ptr, &info_ptr); + } if (png_ptr != NULL) png_destroy_write_struct(&png_ptr, (png_infopp)NULL); if (img != NULL) freeImageData(img); return code;