emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: if FEATURE_CLEAN_UP, free(ptr_to_globals)

Browse Source 
Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Guilherme Maciel Ferreira 2013-10-16 14:43:30 +02:00 committed by Denys Vlasenko
parent 5117eff6f9
commit 840ef17f63
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libbb.h
View File

@ -1773,6 +1773,11 @@ extern struct globals *const ptr_to_globals;
(*(struct globals**)&ptr_to_globals) = (void*)(x); \ (*(struct globals**)&ptr_to_globals) = (void*)(x); \
barrier(); \ barrier(); \
} while (0) } while (0)
#define FREE_PTR_TO_GLOBALS() do { \
if (ENABLE_FEATURE_CLEAN_UP) { \
free(ptr_to_globals); \
} \
} while (0)
/* You can change LIBBB_DEFAULT_LOGIN_SHELL, but don't use it, /* You can change LIBBB_DEFAULT_LOGIN_SHELL, but don't use it,
* use bb_default_login_shell and following defines. * use bb_default_login_shell and following defines.

8
networking/wget.c
View File

@ -89,6 +89,9 @@ struct globals {
#define INIT_G() do { \ #define INIT_G() do { \
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
} while (0) } while (0)
#define FINI_G() do { \
FREE_PTR_TO_GLOBALS(); \
} while (0)
/* Must match option string! */ /* Must match option string! */
@ -1013,5 +1016,10 @@ int wget_main(int argc UNUSED_PARAM, char **argv)
if (G.output_fd >= 0) if (G.output_fd >= 0)
xclose(G.output_fd); xclose(G.output_fd);
#if ENABLE_FEATURE_CLEAN_UP && ENABLE_FEATURE_WGET_LONG_OPTIONS
free(G.extra_headers);
#endif
FINI_G();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }