summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-01-14 10:11:27 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-01-14 10:11:27 +0000
commitf74ca2f5a290b15a7f99a03eec127f9eba2b2d28 (patch)
tree872d308dd1736bafc02d59aae1c4e08fd547b359
parent006e73ec415aa011d2d6f2b657ff7ba14ac6b2b7 (diff)
eio: fix wrong container set in eio_file_map_new.
Bug reported by Kuri. SVN revision: 82749
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/eio/eio_map.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef531fbc26..85be617199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-01-14 Cedric Bail
2
3 * Fix bug in eio_file_map_new container set.
4
12013-01-14 Albin Tonerre 52013-01-14 Albin Tonerre
2 6
3 * Fix endianess issue in Eet_Image. 7 * Fix endianess issue in Eet_Image.
diff --git a/NEWS b/NEWS
index 6541f05457..962d2c2cc7 100644
--- a/NEWS
+++ b/NEWS
@@ -110,3 +110,4 @@ Fixes:
110 * Fix not up to date clip cache for Evas_Object_Text. 110 * Fix not up to date clip cache for Evas_Object_Text.
111 * Evas texblock: Fixed a bug with breaking after format items. 111 * Evas texblock: Fixed a bug with breaking after format items.
112 * Fix endianess issue in Eet_Image. 112 * Fix endianess issue in Eet_Image.
113 * Fix bug in eio_file_map_new container set.
diff --git a/src/lib/eio/eio_map.c b/src/lib/eio/eio_map.c
index 8efa48c8f2..9f913e1d74 100644
--- a/src/lib/eio/eio_map.c
+++ b/src/lib/eio/eio_map.c
@@ -295,7 +295,7 @@ eio_file_map_new(Eina_File *f,
295 map = malloc(sizeof (Eio_File_Map_Rule)); 295 map = malloc(sizeof (Eio_File_Map_Rule));
296 EINA_SAFETY_ON_NULL_RETURN_VAL(map, NULL); 296 EINA_SAFETY_ON_NULL_RETURN_VAL(map, NULL);
297 297
298 map->common.container = f; 298 map->file = f;
299 map->filter_cb = filter_cb; 299 map->filter_cb = filter_cb;
300 map->map_cb = map_cb; 300 map->map_cb = map_cb;
301 map->rule = rule; 301 map->rule = rule;