mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-22 19:45:54 -04:00
Merge pull request #1823 from H3rnand3zzz/fix/msg-crash
Fix memory corruption crash
This commit is contained in:
commit
a99a4fad3e
@ -721,10 +721,9 @@ p_gpg_decrypt(const char* const cipher)
|
|||||||
char* plain_str = gpgme_data_release_and_get_mem(plain_data, &len);
|
char* plain_str = gpgme_data_release_and_get_mem(plain_data, &len);
|
||||||
char* result = NULL;
|
char* result = NULL;
|
||||||
if (plain_str) {
|
if (plain_str) {
|
||||||
plain_str[len] = 0;
|
result = strndup(plain_str, len);
|
||||||
result = g_strdup(plain_str);
|
gpgme_free(plain_str);
|
||||||
}
|
}
|
||||||
gpgme_free(plain_str);
|
|
||||||
|
|
||||||
if (passphrase_attempt) {
|
if (passphrase_attempt) {
|
||||||
passphrase = strdup(passphrase_attempt);
|
passphrase = strdup(passphrase_attempt);
|
||||||
|
10
src/pgp/ox.c
10
src/pgp/ox.c
@ -419,10 +419,12 @@ p_ox_gpg_decrypt(char* base64)
|
|||||||
|
|
||||||
size_t len;
|
size_t len;
|
||||||
char* plain_str = gpgme_data_release_and_get_mem(plain, &len);
|
char* plain_str = gpgme_data_release_and_get_mem(plain, &len);
|
||||||
char* result = malloc(len + 1);
|
char* result = NULL;
|
||||||
memcpy(result, plain_str, len);
|
if (plain_str) {
|
||||||
result[len] = '\0';
|
result = strndup(plain_str, len);
|
||||||
gpgme_free(plain_str);
|
gpgme_free(plain_str);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user