Author: dynis
Date: Sat Jan 24 13:02:19 2009
New Revision: 6250
URL: http://source.netsurf-browser.org?rev=6250&view=rev
Log:
Fix silly memory leaks.
Modified:
trunk/libnsbmp/examples/decode_bmp.c
trunk/libnsbmp/examples/decode_ico.c
Modified: trunk/libnsbmp/examples/decode_bmp.c
URL:
http://source.netsurf-browser.org/trunk/libnsbmp/examples/decode_bmp.c?rev=6250&r1=6249&r2=6250&view=diff
==============================================================================
--- trunk/libnsbmp/examples/decode_bmp.c (original)
+++ trunk/libnsbmp/examples/decode_bmp.c Sat Jan 24 13:02:19 2009
@@ -43,6 +43,7 @@
bmp_result code;
bmp_image bmp;
size_t size;
+ unsigned short res = 0;
if (argc != 2) {
fprintf(stderr, "Usage: %s image.bmp\n", argv[0]);
@@ -59,7 +60,8 @@
code = bmp_analyse(&bmp, size, data);
if (code != BMP_OK) {
warning("bmp_analyse", code);
- exit(1);
+ res = 1;
+ goto cleanup;
}
/* decode the image */
@@ -67,7 +69,8 @@
/* code = bmp_decode_trans(&bmp, TRANSPARENT_COLOR); */
if (code != BMP_OK) {
warning("bmp_decode", code);
- exit(1);
+ res = 1;
+ goto cleanup;
}
printf("P3\n");
@@ -91,11 +94,12 @@
}
}
+cleanup:
/* clean up */
bmp_finalise(&bmp);
free(data);
- return 0;
+ return res;
}
Modified: trunk/libnsbmp/examples/decode_ico.c
URL:
http://source.netsurf-browser.org/trunk/libnsbmp/examples/decode_ico.c?rev=6250&r1=6249&r2=6250&view=diff
==============================================================================
--- trunk/libnsbmp/examples/decode_ico.c (original)
+++ trunk/libnsbmp/examples/decode_ico.c Sat Jan 24 13:02:19 2009
@@ -49,6 +49,7 @@
bmp_result code;
struct bmp_image *bmp;
size_t size;
+ unsigned short res = 0;
if ((argc < 2) || (argc > 4)) {
fprintf(stderr, "Usage: %s collection.ico [width=255]
[height=255]\n", argv[0]);
@@ -67,7 +68,8 @@
code = ico_analyse(&ico, size, data);
if (code != BMP_OK) {
warning("ico_analyse", code);
- exit(1);
+ res = 1;
+ goto cleanup;
}
/* decode the image */
@@ -78,7 +80,8 @@
/* code = bmp_decode_trans(bmp, TRANSPARENT_COLOR); */
if (code != BMP_OK) {
warning("bmp_decode", code);
- exit(1);
+ res = 1;
+ goto cleanup;
}
printf("P3\n");
@@ -102,11 +105,12 @@
}
}
+cleanup:
/* clean up */
ico_finalise(&ico);
free(data);
- return 0;
+ return res;
}
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
