aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-06-12 16:13:32 +0200
committerTobias Brunner <tobias@strongswan.org>2013-06-21 17:03:20 +0200
commit0d2ad63fe2b9206124c150db799e7018bca0d14e (patch)
treed0a1a4af4f50aab99a22c98121fcc5e94366f41d
parent587bdf87688f6176e02633da0d0fdc8924cd9352 (diff)
downloadstrongswan-0d2ad63fe2b9206124c150db799e7018bca0d14e.tar.bz2
strongswan-0d2ad63fe2b9206124c150db799e7018bca0d14e.tar.xz
printf-hook: Avoid double-free when freeing Vstr config
Thread-specific objects get freed when the thread value object is destroyed (wasn't the case earlier, i.e. before 2b19dd35), which may cause the second call to vstr_free_conf() to fail in an assert in Vstr (depending on how it was built).
-rw-r--r--src/libstrongswan/utils/printf_hook.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstrongswan/utils/printf_hook.c b/src/libstrongswan/utils/printf_hook.c
index 6e51aa4c3..f030f45c8 100644
--- a/src/libstrongswan/utils/printf_hook.c
+++ b/src/libstrongswan/utils/printf_hook.c
@@ -474,7 +474,6 @@ METHOD(printf_hook_t, destroy, void,
/* freeing the Vstr_conf of the main thread */
vstr_conf->destroy(vstr_conf);
vstr_conf = NULL;
- vstr_free_conf(conf);
vstr_exit();
#endif
free(this);