From: satbaby <satbaby>
Date: Wed, 15 Aug 2012 11:46:14 +0000 (+0200)
Subject: -fix memory/resource leak
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=0cdce000df1eb73fa1f328f50ede971a5f56ce38;p=tuxwetter.git

-fix memory/resource leak
---

diff --git a/bmps.c b/bmps.c
index 290d4a1..d8f4db4 100644
--- a/bmps.c
+++ b/bmps.c
@@ -42,7 +42,6 @@ lcd_packed_buffer s;
 
 int bmp2lcd (char *bildfile) 
 {
-	char bild2lcd [50];
 	char filename[50];
 	char bmpfile[50];
 	
@@ -83,10 +82,12 @@ int bmp2lcd (char *bildfile)
 	}
 	if (fread(&bh, 1, sizeof(bh), fbmp)!=sizeof(bh)) {
 		perror("fread(BMP_HEADER)");
+		fclose(fbmp);
 		return(3);
 	}
 	if ((bh._B!='B')||(bh._M!='M')) {
 		fprintf(stderr, "Bad Magic (not a BMP file).\n");
+		fclose(fbmp);
 		return(4);
 	}
 
@@ -101,9 +102,13 @@ int bmp2lcd (char *bildfile)
 	colors = malloc(4<<bh.bit_count);
 	if (fread(colors, 1, 4<<bh.bit_count, fbmp)!=4<<bh.bit_count) {
 		perror("fread(BMP_COLORS)");
+		fclose(fbmp);
+		if(colors)
+			free(colors);
 		return(5);
 	}
-
+	if(colors)
+		free(colors);
 	// image
 	line_size = (bh.width*bh.bit_count / 8);
 	bmpline_size = (line_size + 3) & ~3;
@@ -112,6 +117,9 @@ int bmp2lcd (char *bildfile)
 	image = malloc(image_size);
 	if (fread(image, 1, image_size, fbmp)!=image_size) {
 		perror("fread(BMP_IMAGE)");
+		fclose(fbmp);
+		if(image)
+			free(image);
 		return(6);
 	}
 	fclose(fbmp);
@@ -122,6 +130,8 @@ int bmp2lcd (char *bildfile)
 		printf("WARNING: Image is compressed - result unpredictable.\n");
 
 	bmp2raw(bh, image, raw);
+	if(image)
+		free(image);
 	raw2packed(raw, s);
 
 	if(lcd_fd < 0)
diff --git a/build.sh b/build.sh
index df7b811..5e467ac 100644
--- a/build.sh
+++ b/build.sh
@@ -1 +1 @@
-arm-cx2450x-linux-gnueabi-gcc -g -o tuxwetter tuxwetter.c gfx.c io.c text.c parser.c php.c http.c jpeg.c fb_display.c resize.c pngw.c gif.c -L$PREFIX/lib -I$PREFIX/include -I$PREFIX/include/freetype2 -O2 -lfreetype -lz -ljpeg  -lpng -lgif -DWWEATHER gifdecomp.c
+arm-cx2450x-linux-gnueabi-gcc -g -o tuxwetter tuxwetter.c gfx.c io.c text.c parser.c php.c http.c jpeg.c fb_display.c resize.c pngw.c gif.c -L$PREFIX/lib -I$PREFIX/include -I$PREFIX/include/freetype2 -O2 -lfreetype -lcurl -lz -ljpeg  -lpng -lungif -DWWEATHER gifdecomp.c
diff --git a/pngw.c b/pngw.c
index cd65f64..127dd93 100644
--- a/pngw.c
+++ b/pngw.c
@@ -62,7 +62,10 @@ int fh_png_load(const char *name,unsigned char *buffer,int x,int y)
 	if(!(fh=fopen(name,"rb")))	return(FH_ERROR_FILE);
 
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL);
-	if(png_ptr == NULL) return(FH_ERROR_FORMAT);
+	if(png_ptr == NULL) {
+		fclose(fh);
+		return(FH_ERROR_FORMAT);
+	}
 	info_ptr = png_create_info_struct(png_ptr);
 	if(info_ptr == NULL)
 	{
@@ -146,7 +149,10 @@ int fh_png_getsize(const char *name,int *x,int *y, int wanted_width, int wanted_
 	if(!(fh=fopen(name,"rb")))	return(FH_ERROR_FILE);
 
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL);
-	if(png_ptr == NULL) return(FH_ERROR_FORMAT);
+	if(png_ptr == NULL) {
+		fclose(fh);
+		return(FH_ERROR_FORMAT);
+	}
 	info_ptr = png_create_info_struct(png_ptr);
 	if(info_ptr == NULL)
 	{
diff --git a/tuxwetter.c b/tuxwetter.c
index 7f21e75..ab79efe 100644
--- a/tuxwetter.c
+++ b/tuxwetter.c
@@ -350,7 +350,8 @@ int ReadConf(char *iscmd)
 */
 		}
 	}
-
+	if(fd_conf)
+		fclose(fd_conf);
 	return 1;
 }
 
@@ -2368,18 +2369,21 @@ unsigned char *tbuf=lfb;
 		if(fh_png_getsize(ICON_FILE, &x1, &y1, xsize, ysize))
 		{
 			printf("Tuxwetter <invalid PNG-Format>\n");
+			fclose(tfh);
 			return -1;
 		}
 #else
 		if(fh_gif_getsize(ICON_FILE, &x1, &y1, xsize, ysize))
 		{
 			printf("Tuxwetter <invalid GIF-Format>\n");
+			fclose(tfh);
 			return -1;
 		}
 #endif
 		if((buffer=(unsigned char *) malloc(x1*y1*4))==NULL)
 		{
 			printf(NOMEM);
+			fclose(tfh);
 			return -1;
 		}
 #ifdef WWEATHER
@@ -2424,6 +2428,7 @@ unsigned char *tbuf=lfb;
 
 		}
 		free(buffer);
+		fclose(tfh);
 		lfb=tbuf;
 	}
 	return (rv)?-1:0;