aniani
/
profanity
mirror of https://github.com/profanity-im/profanity.git
1
0
Fork 0
Code

Merge pull request #1823 from H3rnand3zzz/fix/msg-crash 

Fix memory corruption crash
This commit is contained in:
Michael Vetter 2023-04-14 13:14:01 +02:00 committed by GitHub
parent ebec68821f 899b26b3bc
commit a99a4fad3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pgp/gpg.c
View File

@ -721,10 +721,9 @@ p_gpg_decrypt(const char* const cipher)
char* plain_str = gpgme_data_release_and_get_mem(plain_data, &len);
char* result = NULL;
if (plain_str) {
plain_str[len] = 0;
result = g_strdup(plain_str);
result = strndup(plain_str, len);
gpgme_free(plain_str);
}
gpgme_free(plain_str);
if (passphrase_attempt) {
passphrase = strdup(passphrase_attempt);

10
src/pgp/ox.c
View File

@ -419,10 +419,12 @@ p_ox_gpg_decrypt(char* base64)
size_t len;
char* plain_str = gpgme_data_release_and_get_mem(plain, &len);
char* result = malloc(len + 1);
memcpy(result, plain_str, len);
result[len] = '\0';
gpgme_free(plain_str);
char* result = NULL;
if (plain_str) {
result = strndup(plain_str, len);
gpgme_free(plain_str);
}
return result;
}