luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-13 11:13:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

win_iconv: Fix some file handler leaks on exit

Browse Source 
I realise this is a contradiction in terms, but it keeps code analysis
tools happy. As spotted by cppcheck, which could not attend GUADEC, but
sends everyone its best wishes anyway.
This commit is contained in:
Philip Withnall 2016-08-13 10:31:26 +02:00
parent f1eeb7cf8c
commit 5707c91a56
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/win_iconv.c
View File

@ -1989,6 +1989,7 @@ main(int argc, char **argv)
size_t r; size_t r;
FILE *in = stdin; FILE *in = stdin;
FILE *out = stdout; FILE *out = stdout;
FILE *in_allocated = NULL, *out_allocated = NULL;
int ignore = 0; int ignore = 0;
char *p; char *p;
@ -2012,7 +2013,7 @@ main(int argc, char **argv)
ignore = 1; ignore = 1;
else if (strcmp(argv[i], "--output") == 0) else if (strcmp(argv[i], "--output") == 0)
{ {
out = fopen(argv[++i], "wb"); out_allocated = out = fopen(argv[++i], "wb");
if(out == NULL) if(out == NULL)
{ {
fprintf(stderr, "cannot open %s\n", argv[i]); fprintf(stderr, "cannot open %s\n", argv[i]);
@ -2021,7 +2022,7 @@ main(int argc, char **argv)
} }
else else
{ {
in = fopen(argv[i], "rb"); in_allocated = in = fopen(argv[i], "rb");
if (in == NULL) if (in == NULL)
{ {
fprintf(stderr, "cannot open %s\n", argv[i]); fprintf(stderr, "cannot open %s\n", argv[i]);
@ -2086,6 +2087,11 @@ main(int argc, char **argv)
iconv_close(cd); iconv_close(cd);
if (in_allocated != NULL)
fclose (in_allocated);
if (out_allocated != NULL)
fclose (out_allocated);
return 0; return 0;
} }
#endif #endif