amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-17 09:25:25 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): Fix segfault when TNEF does not get any data. Fixes #4190

Browse Source
This commit is contained in:
smizrahi
2023-02-23 11:58:58 +01:00
parent 53f9449a51
commit 02f855059b
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoTNEFMailBodyPart.m
+22 -18
View File
@@ -705,15 +705,17 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
if (isObject)
{
// This is an "embedded object", so skip the 16-byte identifier first.
memcpy(&object_signature, filedata->data + 16, sizeof(DWORD));
if (TNEFCheckForSignature(object_signature) == 0) {
TNEFInitialize(&emb_tnef);
emb_tnef.Debug = tnef.Debug;
if (TNEFParseMemory(filedata->data + 16, filedata->size - 16, &emb_tnef) != -1)
{
isRealAttachment = NO;
}
TNEFFree(&emb_tnef);
if (NULL != filedata->data) {
memcpy(&object_signature, filedata->data + 16, sizeof(DWORD));
if (TNEFCheckForSignature(object_signature) == 0) {
TNEFInitialize(&emb_tnef);
emb_tnef.Debug = tnef.Debug;
if (TNEFParseMemory(filedata->data + 16, filedata->size - 16, &emb_tnef) != -1)
{
isRealAttachment = NO;
}
TNEFFree(&emb_tnef);
}
}
}
else
@@ -798,16 +800,18 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
}
NSData *attachment;
if (isObject)
attachment = [NSData dataWithBytes: filedata->data + 16 length: filedata->size - 16];
else
attachment = [NSData dataWithBytes: filedata->data length: filedata->size];
if (NULL != filedata->data) {
if (isObject)
attachment = [NSData dataWithBytes: filedata->data + 16 length: filedata->size - 16];
else
attachment = [NSData dataWithBytes: filedata->data length: filedata->size];
[self bodyPartForAttachment: attachment
withName: partName
andType: type
andSubtype: subtype
andContentId: cid];
[self bodyPartForAttachment: attachment
withName: partName
andType: type
andSubtype: subtype
andContentId: cid];
}
// count++;
}