aboutsummaryrefslogtreecommitdiffstats
path: root/epan/prefs.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-04-29 00:44:46 +0200
committerAnders Broman <a.broman58@gmail.com>2014-04-29 04:17:54 +0000
commit8dc7d164dcdbb76b0e50d2c853250f5834b43e59 (patch)
treed9cac9b10e50506cbc0ba709d4c0b7b3c106ba51 /epan/prefs.c
parente8cb6231661ef36f17d3c2a7a9f9d12600120047 (diff)
prefs: prevent double-free on changing prefs
Prevent double-free when changing profiles. After switching from the default profile to a profile without a preferences file, saved_at_version will be freed, but a new version will not be inserted (because the prefs file is empty). On a subsequent switch to another profile, the saved_at_version field is freed again leading to a crash. Bug: 9463 Change-Id: Ia9e0936e32603b4676a37dc428bda40c264a6eaa Reviewed-on: https://code.wireshark.org/review/1425 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/prefs.c')
-rw-r--r--epan/prefs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 645023f0dc..bd22c0bda4 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -3126,6 +3126,8 @@ prefs_reset(void)
{
prefs_initialized = FALSE;
g_free(prefs.saved_at_version);
+ prefs.saved_at_version = NULL;
+
/*
* Unload all UAT preferences.
*/