summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-02-06 09:28:17 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-02-06 09:28:17 +0000
commit2543e5523e0088e47a6a70bb78815fcea4f89d55 (patch)
treee8a34040e501e912cabe27cc19c86f6a835b3db8
parent2fdedc3c18f0d77ee652e3ae91d7865390836a57 (diff)
downloadeina-2543e5523e0088e47a6a70bb78815fcea4f89d55.tar.gz
eina: backport r83668.
SVN revision: 83669
-rw-r--r--ChangeLog3
-rw-r--r--NEWS1
-rw-r--r--src/lib/eina_file.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ade1a6..65ccb97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -400,4 +400,5 @@
2013-02-06 Cedric Bail
- * eina: counter measure denial of service on eina_hash function.
+ * counter measure denial of service on eina_hash function.
+ * fix map leak in Eina_File.
diff --git a/NEWS b/NEWS
index f6fa5df..b4dc067 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes since Eina 1.7.5:
-------------------------
* Prevent denial of service on Eina_Hash function.
+ * Fix map leak in Eina_File infrastructure.
Changes since Eina 1.7.4:
-------------------------
diff --git a/src/lib/eina_file.c b/src/lib/eina_file.c
index d34f917..68a6cce 100644
--- a/src/lib/eina_file.c
+++ b/src/lib/eina_file.c
@@ -1327,7 +1327,7 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
if (map->map == MAP_FAILED) goto on_error;
eina_hash_add(file->map, &key, map);
- eina_hash_direct_add(file->rmap, map->map, map);
+ eina_hash_direct_add(file->rmap, &map->map, map);
}
map->refcount++;