From 7b72f50c1c59d18ad6dc18596b4eba8d6f112296 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 13 Aug 2021 08:20:29 -0400 Subject: [PATCH] fix(mail): avoid name collision in SOGoTnefMailBodyPart.m --- SoObjects/Mailer/SOGoTnefMailBodyPart.m | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/SoObjects/Mailer/SOGoTnefMailBodyPart.m b/SoObjects/Mailer/SOGoTnefMailBodyPart.m index 086c2db2a..575c40b90 100644 --- a/SoObjects/Mailer/SOGoTnefMailBodyPart.m +++ b/SoObjects/Mailer/SOGoTnefMailBodyPart.m @@ -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)