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

fix(mail): avoid name collision in SOGoTnefMailBodyPart.m

Browse Source
This commit is contained in:
Francis Lachapelle
2021-08-13 08:20:29 -04:00
parent 87ccc5c041
commit 7b72f50c1c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoTnefMailBodyPart.m
+5 -6
View File
@@ -174,7 +174,6 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
part = nil;
filename = nil;
bodyParts = [[NGMimeMultipartBody alloc] init];
[bodyParts retain];
}
return self;
@@ -697,13 +696,13 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
isRealAttachment = YES;
TNEFStruct emb_tnef;
DWORD signature;
DWORD object_signature;
if (isObject)
{
// This is an "embedded object", so skip the 16-byte identifier first.
memcpy(&signature, filedata->data + 16, sizeof(DWORD));
if (TNEFCheckForSignature(signature) == 0) {
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)
@@ -715,8 +714,8 @@ unsigned char GetRruleMonthNum(unsigned char a, unsigned char b) {
}
else
{
memcpy(&signature, filedata->data, sizeof(DWORD));
if (TNEFCheckForSignature(signature) == 0) {
memcpy(&object_signature, filedata->data, sizeof(DWORD));
if (TNEFCheckForSignature(object_signature) == 0) {
TNEFInitialize(&emb_tnef);
emb_tnef.Debug = tnef.Debug;
if (TNEFParseMemory(filedata->data, filedata->size, &emb_tnef) != -1)