Mercurial > hg > dmlib

changeset 933:8fe48c08dbca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some memory leaks etc.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 25 Feb 2015 19:51:14 +0200
parents 6320bf08e302
children fa15335238cf
files tools/gfxconv.c tools/view64.c
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tools/gfxconv.c	Wed Feb 25 19:39:48 2015 +0200
+++ b/tools/gfxconv.c	Wed Feb 25 19:51:14 2015 +0200
@@ -1554,7 +1554,7 @@
 
 int main(int argc, char *argv[])
 {
-    FILE *inFile;
+    FILE *inFile = NULL;
     const DMC64ImageFormat *cfmt;
     DMC64Image *cimage = NULL;
     Uint8 *dataBuf = NULL;
@@ -1795,15 +1795,12 @@
             break;
     }
 
-    fclose(inFile);
+error:
+    if (inFile != NULL)
+        fclose(inFile);
 
     dmFree(dataBuf);
-    exit(0);
-    return 0;
+    dmC64ImageFree(cimage);
 
-error:
-    dmFree(dataBuf);
-    dmFree(cimage);
-    return -3;
-    exit(3);
+    return 0;
 }
--- a/tools/view64.c	Wed Feb 25 19:39:48 2015 +0200
+++ b/tools/view64.c	Wed Feb 25 19:51:14 2015 +0200
@@ -312,6 +312,8 @@
 
 
 error:
+    dmC64ImageFree(cimage);
+
     if (screen)
         SDL_FreeSurface(screen);