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
commitdce65e8c485e61084282d6815700410c7dd365d1 (patch)
tree25ab4f3d8638d250b47e58b11a5470038618190c
parent794e2c0282ee12b17598283b8bfec6dec19a882e (diff)
downloadeet-dce65e8c485e61084282d6815700410c7dd365d1.tar.gz
* eet: Fix bug when using compression and ciphering.
Reported by discomfitor. SVN revision: 54540
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eet_lib.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ee2347..c939882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -444,3 +444,7 @@
2010-11-12 Cedric BAIL
* Don't try to read broken file when open in READ_WRITE mode.
+
+2010-11-14 Cedric BAIL
+
+ * Fix bug with cypher and compression used together.
diff --git a/src/lib/eet_lib.c b/src/lib/eet_lib.c
index d7f1a2e..82aad09 100644
--- a/src/lib/eet_lib.c
+++ b/src/lib/eet_lib.c
@@ -2287,7 +2287,6 @@ eet_write_cipher(Eet_File *ef,
data2 = data_ciphered;
data_size = data_ciphered_sz;
- size = (data_size > size) ? data_size : size;
}
else
{