summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-01-05 21:26:21 +0000
committerOlivier Blin <blino@mageia.org>2012-01-05 21:26:21 +0000
commitc57f79833dfb7b781c0478102661c175e82ee321 (patch)
tree9c90a1187f12f4a0d44066302a92b36fa314bbaa
parent15aeb66c31b81adf1df0f794eaf272916ec9b9bc (diff)
downloadldetect-c57f79833dfb7b781c0478102661c175e82ee321.tar
ldetect-c57f79833dfb7b781c0478102661c175e82ee321.tar.gz
ldetect-c57f79833dfb7b781c0478102661c175e82ee321.tar.bz2
ldetect-c57f79833dfb7b781c0478102661c175e82ee321.tar.xz
ldetect-c57f79833dfb7b781c0478102661c175e82ee321.zip
fix double free introduced by titi in r2580 (and by the way, there was no leak in r226763, it has been introduced later on)
-rw-r--r--NEWS2
-rw-r--r--modalias.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5b5f2f7..4ce7b4e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix double free
+
Version 0.11.4 - 5 January 2012, Thierry Vignaud
- plug some memleaks
diff --git a/modalias.c b/modalias.c
index eb33423..f5a667b 100644
--- a/modalias.c
+++ b/modalias.c
@@ -59,7 +59,6 @@ static void set_default_alias_file(void) {
(!stat(fallback_aliases, &st_fallback) && st_fallback.st_mtime > st_alias.st_mtime)) {
free(aliasfilename);
aliasdefault = fallback_aliases;
- free(aliasfilename);
} else {
aliasdefault = aliasfilename;
free(fallback_aliases);