From 0a236df1c1cc19cdd2db41703a97d80a4d4a39c7 Mon Sep 17 00:00:00 2001 From: Anurag Aggarwal Date: Wed, 1 Jul 2020 16:18:00 +0530 Subject: [PATCH 1/2] Fix memory leaks --- src/ui/image_qt.cpp | 4 ---- src/util/xstdio.cpp | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ui/image_qt.cpp b/src/ui/image_qt.cpp index 347e7935..a916a4d8 100644 --- a/src/ui/image_qt.cpp +++ b/src/ui/image_qt.cpp @@ -88,10 +88,6 @@ const char* readpng(xio_constpath filename) static void freeImage(struct image *img) { - QImage **data = (QImage **)(img->data); - delete data[0]; - delete data[1]; - delete data; free(img); } diff --git a/src/util/xstdio.cpp b/src/util/xstdio.cpp index e945a343..9b013aac 100644 --- a/src/util/xstdio.cpp +++ b/src/util/xstdio.cpp @@ -113,9 +113,9 @@ xio_path xio_getdirectory(xio_constpath filename) xio_path xio_getfilename(const char *basename, const char *extension) { - int pathlength = strlen(basename) + strlen(extension); + size_t pathlength = strlen(basename) + strlen(extension); static char* name; - name = (char* )malloc(pathlength); + name = (char* )malloc(pathlength + 2); int nimage = 0; struct stat sb; char *base = xio_fixpath(basename); From bf41297d1b874e049f029320c8e11ea356e2c6f9 Mon Sep 17 00:00:00 2001 From: Anurag Aggarwal Date: Wed, 1 Jul 2020 18:56:23 +0530 Subject: [PATCH 2/2] Add more padding --- src/util/xstdio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/xstdio.cpp b/src/util/xstdio.cpp index 9b013aac..4ed92c66 100644 --- a/src/util/xstdio.cpp +++ b/src/util/xstdio.cpp @@ -115,7 +115,7 @@ xio_path xio_getfilename(const char *basename, const char *extension) { size_t pathlength = strlen(basename) + strlen(extension); static char* name; - name = (char* )malloc(pathlength + 2); + name = (char* )malloc(pathlength + 16); //Extra padding for memory leak fix int nimage = 0; struct stat sb; char *base = xio_fixpath(basename);