summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/eet_cipher.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9df47e5..c862049 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -594,3 +594,7 @@
2012-05-15 Cedric Bail
* Make eet_dictionary thread safe.
+
+2012-05-30 Cedric Bail
+
+ * Check that gnutls and openssl don't return below zero size during decipher.
diff --git a/NEWS b/NEWS
index 5d11d3e..f7da97e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Changes since Eet 1.6.0:
Fixes:
* Force destruction of all pending file when shuting down eet.
* Make eet_dictionary thread safe.
+ * Check that gnutls and openssl don't return below zero size during decipher.
Eet 1.6.0
diff --git a/src/lib/eet_cipher.c b/src/lib/eet_cipher.c
index 2425e22..9441d8c 100644
--- a/src/lib/eet_cipher.c
+++ b/src/lib/eet_cipher.c
@@ -1219,7 +1219,7 @@ eet_decipher(const void *data,
/* Get the decrypted data size */
tmp = *ret;
tmp = ntohl(tmp);
- if (tmp > tmp_len)
+ if (tmp > tmp_len || tmp <= 0)
goto on_error;
/* Update the return values */