From b9f0906723aaec03b0c694cdf3a263d72ed73f1a Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Mon, 5 Dec 2011 10:27:24 +0000 Subject: [PATCH] fixed memory release bugs --- src/server/server.c | 4 +++- src/server/sysinfo.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/server.c b/src/server/server.c index ccb4d67..eec698b 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -319,7 +319,7 @@ int main(int argc, char *argv[]) textdomain(PACKAGE); #endif - server_data.www_dir = DEFAULT_WWW_DIR; + server_data.www_dir = NULL; server_data.psysinfo.interfaces = NULL; while ((optc = getopt_long(argc, argv, @@ -348,6 +348,8 @@ int main(int argc, char *argv[]) } } + server_data.www_dir = strdup(DEFAULT_WWW_DIR); + if (!cmdok || optind != argc) { fprintf(stderr, _("Try `%s --help' for more information.\n"), program_name); diff --git a/src/server/sysinfo.c b/src/server/sysinfo.c index b58a607..09929da 100644 --- a/src/server/sysinfo.c +++ b/src/server/sysinfo.c @@ -64,7 +64,7 @@ void sysinfo_update(struct psysinfo *info) void sysinfo_cleanup() { if (cpu) - free(cpu); + g_free(cpu); } static json_object *ram_to_json_object(const struct psysinfo *s) -- 2.7.4