eet: backport r71524.

SVN revision: 71525

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c3f578..6d060c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -546,8 +546,11 @@
 	* JPEG encode and decode in eet now uses ISLOW (not IFAST) due to
         noticable quality losses in the chase for speed. It will use
         IFAST for quality less than 60 when encoding
-        
+
 2011-12-02 Carsten Haitzler (The Rasterman)
 
         1.5.0 release
-        
+
+2012-05-30  Cedric Bail
+
+	* Check that gnutls and openssl don't return below zero size during decipher.
diff --git a/src/lib/eet_cipher.c b/src/lib/eet_cipher.c
index 89ee65d..b0ad6fd 100644
--- a/src/lib/eet_cipher.c
+++ b/src/lib/eet_cipher.c
@@ -1174,7 +1174,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 */