enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

eet: fix crash when cyphering hyge amount of data. 

Patch by Leandro Sansilva.


SVN revision: 72906
This commit is contained in:
Cedric BAIL 2012-06-27 00:37:05 +00:00
parent 28d9f92ef2
commit 04a81e3c6f
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/eet/AUTHORS
View File

@ -13,3 +13,4 @@ Adam Simpkins <adam@adamsimpkins.net>
Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Lionel Orry <lionel.orry@gmail.com>
Jérôme Pinot <ngc891@gmail.com>
Leandro Sansilva

4
legacy/eet/ChangeLog
View File

@ -598,3 +598,7 @@
2012-05-30 Cedric Bail
* Check that gnutls and openssl don't return below zero size during decipher.
2012-06-27 Leandro Sansilva
* Fix crash when cyphering huge amount of data.

1
legacy/eet/NEWS
View File

@ -7,6 +7,7 @@ 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.
* Fix crash when cyphering huge amount of data.
Eet 1.6.0

8
legacy/eet/src/lib/eet_cipher.c
View File

@ -968,7 +968,7 @@ eet_cipher(const void *data,
# else /* ifdef HAVE_GNUTLS */
/* Openssl declarations*/
EVP_CIPHER_CTX ctx;
unsigned int *buffer;
unsigned int *buffer = NULL;
int tmp_len;
# endif /* ifdef HAVE_GNUTLS */
@ -1043,7 +1043,8 @@ eet_cipher(const void *data,
/* Gcrypt close the cipher */
gcry_cipher_close(cipher);
# else /* ifdef HAVE_GNUTLS */
buffer = alloca(crypted_length);
buffer = malloc(crypted_length);
if (!buffer) goto on_error;
*buffer = tmp;
memcpy(buffer + 1, data, size);
@ -1071,6 +1072,7 @@ eet_cipher(const void *data,
goto on_error;
EVP_CIPHER_CTX_cleanup(&ctx);
free(buffer);
# endif /* ifdef HAVE_GNUTLS */
/* Set return values */
@ -1098,6 +1100,8 @@ on_error:
if (opened)
EVP_CIPHER_CTX_cleanup(&ctx);
free(buffer);
# endif /* ifdef HAVE_GNUTLS */
/* General error */
free(ret);