aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwachs <wachs@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-10 12:20:20 +0000
committerwachs <wachs@140774ce-b5e7-0310-ab8b-a85725594a96>2012-12-10 12:20:20 +0000
commite9a715df3ab044a7cfbe84da1811255ed2cda6ee (patch)
treef970dbb768aedc4a4db77ba6e76cfe663e466e42
parent5ccd371c9d658316de4e2e58a2a19098bee64e17 (diff)
mem leak in line 193configuration.c
git-svn-id: https://gnunet.org/svn/gnunet@25344 140774ce-b5e7-0310-ab8b-a85725594a96
-rw-r--r--src/util/configuration.c4
-rw-r--r--src/util/plugin.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 5072ba5ad0..1088fac2a7 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -234,6 +234,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value))
{
ret = GNUNET_SYSERR; /* failed to parse included config */
+ GNUNET_free_non_null (line_orig);
break;
}
}
@@ -242,6 +243,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Ignoring parsing @INLINE@ configurations, not allowed!\n");
ret = GNUNET_SYSERR;
+ GNUNET_free_non_null (line_orig);
break;
}
continue;
@@ -291,9 +293,11 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
_("Syntax error while deserializing in line %u\n"),
nr);
ret = GNUNET_SYSERR;
+ GNUNET_free_non_null (line_orig);
break;
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Finished deserializing config\n", tag);
+ GNUNET_free_non_null (line_orig);
GNUNET_free (section);
GNUNET_assert ( (GNUNET_OK != ret) || (r_bytes == size) );
return ret;
diff --git a/src/util/plugin.c b/src/util/plugin.c
index 4e0385a098..e15948b3c4 100644
--- a/src/util/plugin.c
+++ b/src/util/plugin.c
@@ -272,12 +272,12 @@ GNUNET_PLUGIN_unload (const char *library_name, void *arg)
plugins = pos->next;
else
prev->next = pos->next;
- lt_dlclose (pos->handle);
+ //lt_dlclose (pos->handle);
GNUNET_free (pos->name);
GNUNET_free (pos);
if (plugins == NULL)
{
- plugin_fini ();
+ //plugin_fini ();
initialized = GNUNET_NO;
}
return ret;