summaryrefslogtreecommitdiff
path: root/legacy/eio
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-04 01:46:03 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-04 01:46:03 +0000
commitadd842257d29bb30a9853d29dcbd1a27fbb643c2 (patch)
tree765177c8447310dc76e6dfc840971b28df7345b4 /legacy/eio
parentd6f61a6b4f55cd65a4b7d164347c0781f1b1555b (diff)
eio: Fix possible memory corruption in eio_eet_data_read_cipher()
Patch by Daniel Willmann <d.willmann@samsung.com> SVN revision: 77392
Diffstat (limited to 'legacy/eio')
-rw-r--r--legacy/eio/AUTHORS1
-rw-r--r--legacy/eio/ChangeLog4
-rw-r--r--legacy/eio/NEWS1
-rw-r--r--legacy/eio/src/lib/eio_eet.c2
4 files changed, 7 insertions, 1 deletions
diff --git a/legacy/eio/AUTHORS b/legacy/eio/AUTHORS
index 27d6bd6685..27aeadc3bf 100644
--- a/legacy/eio/AUTHORS
+++ b/legacy/eio/AUTHORS
@@ -5,3 +5,4 @@ Vincent "caro" Torri <vtorri at univ-evry dot fr>
5Mikael SANS <sans.mikael@gmail.com> 5Mikael SANS <sans.mikael@gmail.com>
6Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@gmail.com> 6Mike Blumenkrantz (zmike/discomfitor) <michael.blumenkrantz@gmail.com>
7Jérôme Pinot <ngc891@gmail.com> 7Jérôme Pinot <ngc891@gmail.com>
8Daniel Willmann <d.willmann@samsung.com>
diff --git a/legacy/eio/ChangeLog b/legacy/eio/ChangeLog
index 2b8065c2ff..bc42978fe3 100644
--- a/legacy/eio/ChangeLog
+++ b/legacy/eio/ChangeLog
@@ -51,3 +51,7 @@
512012-09-27 Cedric Bail 512012-09-27 Cedric Bail
52 52
53 * Don't stop on limited access right. 53 * Don't stop on limited access right.
54
552012-10-03 Daniel Willmann
56 * Fix memory corruption by allocating enough memory in
57 eio_eet_data_read_cipher().
diff --git a/legacy/eio/NEWS b/legacy/eio/NEWS
index a841aae806..1fddc650e1 100644
--- a/legacy/eio/NEWS
+++ b/legacy/eio/NEWS
@@ -9,6 +9,7 @@ Fixes:
9 - fix monitor shutdown when mainloop did never run. 9 - fix monitor shutdown when mainloop did never run.
10 - fix build with xattr and without splice. 10 - fix build with xattr and without splice.
11 - don't stop on limited access right. 11 - don't stop on limited access right.
12 - Fix memory corruption by allocating enough memory in eio_eet_data_read_cipher().
12 13
13Improvements: 14Improvements:
14 15
diff --git a/legacy/eio/src/lib/eio_eet.c b/legacy/eio/src/lib/eio_eet.c
index 36cf114f1b..049c1e39a9 100644
--- a/legacy/eio/src/lib/eio_eet.c
+++ b/legacy/eio/src/lib/eio_eet.c
@@ -458,7 +458,7 @@ eio_eet_data_read_cipher(Eet_File *ef,
458 EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL); 458 EINA_SAFETY_ON_NULL_RETURN_VAL(done_cb, NULL);
459 EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL); 459 EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
460 460
461 er = malloc(sizeof (er)); 461 er = malloc(sizeof (Eio_Eet_Read));
462 EINA_SAFETY_ON_NULL_RETURN_VAL(er, NULL); 462 EINA_SAFETY_ON_NULL_RETURN_VAL(er, NULL);
463 463
464 er->ef = ef; 464 er->ef = ef;