summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-11-13 23:04:31 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-11-13 23:04:31 +0000
commita763db242f8817e861deed64c5626ffacf62018b (patch)
tree126257d80a7467c534192dcd1b3de4c94200081a
parenta32b3d4c8ab47ccf8dc9c47e1fba387a5bb20590 (diff)
* eet: Fix bug when using compression and ciphering.
Reported by discomfitor. SVN revision: 54540
Diffstat (limited to '')
-rw-r--r--legacy/eet/ChangeLog4
-rw-r--r--legacy/eet/src/lib/eet_lib.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 5ee2347b58..c939882d68 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -444,3 +444,7 @@
4442010-11-12 Cedric BAIL 4442010-11-12 Cedric BAIL
445 445
446 * Don't try to read broken file when open in READ_WRITE mode. 446 * Don't try to read broken file when open in READ_WRITE mode.
447
4482010-11-14 Cedric BAIL
449
450 * Fix bug with cypher and compression used together.
diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c
index d7f1a2e329..82aad0910e 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/legacy/eet/src/lib/eet_lib.c
@@ -2287,7 +2287,6 @@ eet_write_cipher(Eet_File *ef,
2287 2287
2288 data2 = data_ciphered; 2288 data2 = data_ciphered;
2289 data_size = data_ciphered_sz; 2289 data_size = data_ciphered_sz;
2290 size = (data_size > size) ? data_size : size;
2291 } 2290 }
2292 else 2291 else
2293 { 2292 {