summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2015-11-13 15:20:48 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-15 10:29:36 -0800
commit84b7a37869ac87aea595b57075d895d0035026d0 (patch)
treedd2912431dc92fe15cf1666a252242079e699d53
parente0f4e6103031ccaab3a7821d6ad96c66b85dc9e0 (diff)
downloadsubsurface-84b7a37869ac87aea595b57075d895d0035026d0.tar.gz
subsurfacestartup.c: leave free_prefs() empty
There is a bug on OSX where free() is called on non-allocated memory in free_prefs(). Most of the preferences are not freed in free_prefs() while copy_string() is used on them, so let's not free() any pointers in free_prefs() and leave them as one-time leaks. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface-core/subsurfacestartup.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/subsurface-core/subsurfacestartup.c b/subsurface-core/subsurfacestartup.c
index 5b3dfa8c1..c39c89c17 100644
--- a/subsurface-core/subsurfacestartup.c
+++ b/subsurface-core/subsurfacestartup.c
@@ -313,11 +313,5 @@ void copy_prefs(struct preferences *src, struct preferences *dest)
*/
void free_prefs(void)
{
- free((void*)prefs.default_cylinder);
- free((void*)prefs.divelist_font);
- free((void*)prefs.cloud_storage_password);
- free(prefs.proxy_host);
- free(prefs.proxy_user);
- free(prefs.proxy_pass);
- free(prefs.userid);
+ // nop
}