github-mirrors/php-gnupg
1
0
Fork 0
mirror of https://github.com/php-gnupg/php-gnupg.git synced 2024-11-22 22:37:10 +00:00
Code Issues Projects Releases Packages Activity

Properly allocate and free encryptkeys

Browse source
This commit is contained in:
Jakub Zelenka 2016-12-12 18:56:54 +00:00
parent 3d298a4f38
commit dda2f09054
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnupg.c
View file

@ -91,11 +91,9 @@ static void gnupg_free_encryptkeys(PHPC_THIS_DECLARE(gnupg) TSRMLS_DC)
for (idx=0; idx < PHPC_THIS->encrypt_size; idx++) { for (idx=0; idx < PHPC_THIS->encrypt_size; idx++) {
gpgme_key_unref(PHPC_THIS->encryptkeys[idx]); gpgme_key_unref(PHPC_THIS->encryptkeys[idx]);
} }
/* it's an odd-thing, but other solutions makes problems : if (PHPC_THIS->encryptkeys != NULL) {
* erealloc(x,0) gives a segfault with PHP 4 and debug enabled efree(PHPC_THIS->encryptkeys);
* efree(x) alone ends in a segfault }
*/
efree(erealloc(PHPC_THIS->encryptkeys, 0));
PHPC_THIS->encryptkeys = NULL; PHPC_THIS->encryptkeys = NULL;
PHPC_THIS->encrypt_size = 0; PHPC_THIS->encrypt_size = 0;
} }
@ -1003,6 +1001,7 @@ PHP_FUNCTION(gnupg_addencryptkey)
char *key_id = NULL; char *key_id = NULL;
phpc_str_size_t key_id_len; phpc_str_size_t key_id_len;
gpgme_key_t gpgme_key = NULL; gpgme_key_t gpgme_key = NULL;
size_t encrypt_keys_size;
GNUPG_GETOBJ(); GNUPG_GETOBJ();
@ -1023,8 +1022,13 @@ PHP_FUNCTION(gnupg_addencryptkey)
GNUPG_ERR("get_key failed"); GNUPG_ERR("get_key failed");
RETURN_FALSE; RETURN_FALSE;
} }
PHPC_THIS->encryptkeys = erealloc(PHPC_THIS->encryptkeys,
sizeof(PHPC_THIS->encryptkeys) * (PHPC_THIS->encrypt_size + 2)); encrypt_keys_size = sizeof(PHPC_THIS->encryptkeys) * (PHPC_THIS->encrypt_size + 2);
if (PHPC_THIS->encryptkeys == NULL) {
PHPC_THIS->encryptkeys = emalloc(encrypt_keys_size);
} else {
PHPC_THIS->encryptkeys = erealloc(PHPC_THIS->encryptkeys, encrypt_keys_size);
}
PHPC_THIS->encryptkeys[PHPC_THIS->encrypt_size] = gpgme_key; PHPC_THIS->encryptkeys[PHPC_THIS->encrypt_size] = gpgme_key;
PHPC_THIS->encrypt_size++; PHPC_THIS->encrypt_size++;
PHPC_THIS->encryptkeys[PHPC_THIS->encrypt_size] = NULL; PHPC_THIS->encryptkeys[PHPC_THIS->encrypt_size] = NULL;