amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-06 22:08:51 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): avoid exception when accessing signed/encrypted body parts

Browse Source
This commit is contained in:
Francis Lachapelle
2022-04-08 10:01:54 -04:00
parent 1228cc5213
commit c6a41d31ce
1 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
SoObjects/Mailer/SOGoMailObject.m
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2007-2017 Inverse inc.
Copyright (C) 2007-2022 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of SOGo.
@@ -1162,7 +1162,7 @@ static BOOL debugSoParts = NO;
NSArray *parts;
Class clazz;
int part;
int partIndex;
if ([self isEncrypted])
{
@@ -1178,11 +1178,24 @@ static BOOL debugSoParts = NO;
id part;
m = [[self content] messageFromEncryptedDataAndCertificate: certificate];
part = nil;
partIndex = [_key intValue] - 1;
parts = [[m body] parts];
if (partIndex > -1 && partIndex < [parts count])
part = [parts objectAtIndex: partIndex];
if (part)
{
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
}
else
{
[self logWithFormat: @"Lookup of body part %@ failed for encrypted message (%i parts found)", _key, [parts count]];
clazz = Nil;
}
part = [[[m body] parts] objectAtIndex: ([_key intValue]-1)];
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
return [clazz objectWithName:_key inContainer: self];
}
}
@@ -1192,11 +1205,25 @@ static BOOL debugSoParts = NO;
id part;
m = [[self content] messageFromOpaqueSignedData];
part = nil;
partIndex = [_key intValue] - 1;
parts = [[m body] parts];
if (partIndex > -1 && partIndex < [parts count])
part = [parts objectAtIndex: partIndex];
if (part)
{
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
}
else
{
[self logWithFormat: @"Lookup of body part %@ failed for signed message (%i parts found)", _key, [parts count]];
clazz = Nil;
}
part = [[[m body] parts] objectAtIndex: ([_key intValue]-1)];
mimeType = [[part contentType] stringValue];
clazz = [SOGoMailBodyPart bodyPartClassForMimeType: mimeType
inContext: _ctx];
return [clazz objectWithName:_key inContainer: self];
}
@@ -1211,9 +1238,9 @@ static BOOL debugSoParts = NO;
}
else
{
part = [_key intValue] - 1;
if (part > -1 && part < [parts count])
partDesc = [parts objectAtIndex: part];
partIndex = [_key intValue] - 1;
if (partIndex > -1 && partIndex < [parts count])
partDesc = [parts objectAtIndex: partIndex];
else
partDesc = nil;
}