Merge pull request #181 from kanurag94/png-xaos

Fix XaoS memory leak issues
xaos-project · Jul 1, 2020 · fe9dfe1 · fe9dfe1
2 parents b1e312d + bf41297
commit fe9dfe1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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 + 16); //Extra padding for memory leak fix
     int nimage = 0;
     struct stat sb;
     char *base = xio_fixpath(basename);