From f9550b91812248b12657943fd81d3524399eb4ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20S=C3=A1ez?= Date: Mon, 19 Jan 2015 15:35:44 +0100 Subject: [PATCH] oc: several uninitialized variables --- OpenChange/MAPIStoreDBFolder.m | 2 ++ OpenChange/MAPIStoreFolder.m | 3 +++ OpenChange/MAPIStoreMailFolder.m | 3 +++ OpenChange/MAPIStoreMessage.m | 4 +++- OpenChange/MAPIStoreObject.m | 1 + OpenChange/RTFHandler.m | 2 ++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m index f9b2e128d..ec7207062 100644 --- a/OpenChange/MAPIStoreDBFolder.m +++ b/OpenChange/MAPIStoreDBFolder.m @@ -138,6 +138,8 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact"; MAPIStoreMapping *mapping; NSRange slashRange; + pathComponent = nil; + if (isMove && [targetFolder isKindOfClass: MAPIStoreDBFolderK]) { path = [sogoObject path]; diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 15f3ca431..a939b9610 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -102,6 +102,8 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe NSUInteger lastPartIdx; MAPIStoreUserContext *userContext; + parts = 0; + lastPartIdx = 0; folderURL = [NSURL URLWithString: [self url]]; /* note: -[NSURL path] returns an unescaped representation */ path = [folderURL path]; @@ -233,6 +235,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe SOGoFolder *sogoFolder; WOContext *woContext; + childFolder = nil; if ([[self folderKeys] containsObject: folderKey]) { woContext = [[self userContext] woContext]; diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m index 12db06a08..57679c1f1 100644 --- a/OpenChange/MAPIStoreMailFolder.m +++ b/OpenChange/MAPIStoreMailFolder.m @@ -164,6 +164,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK; int i; nameInContainer = nil; + rc = MAPISTORE_ERROR; folderName = nil; for (i = 0; !folderName && i < aRow->cValues; i++) @@ -1003,6 +1004,8 @@ _parseIMAPRange (const unichar *uniString, NSArray **UIDsP) uint32_t currentUid, rangeMin; BOOL done = NO, inRange = NO; + rangeMin = 0; + currentUid = 0; UIDs = [NSMutableArray array]; while (!done) { diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m index fc20dd0d0..2c5707158 100644 --- a/OpenChange/MAPIStoreMessage.m +++ b/OpenChange/MAPIStoreMessage.m @@ -474,7 +474,9 @@ rtf2html (NSData *compressedRTF) MAPIStoreMessage *mainMessage; //[self logWithFormat: @"METHOD '%s' (%d)", __FUNCTION__, __LINE__]; - + + containerTables = nil; + max = 0; context = [self context]; ownerUser = [[self userContext] sogoUser]; userIsOwner = [[context activeUser] isEqual: ownerUser]; diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m index 1c85caf04..1c4b26be4 100644 --- a/OpenChange/MAPIStoreObject.m +++ b/OpenChange/MAPIStoreObject.m @@ -250,6 +250,7 @@ static Class NSExceptionK, MAPIStoreFolderK; id value; tz = nil; + tzOffset = 0; newProperties = [NSMutableDictionary dictionaryWithCapacity: aRow->cValues]; for (counter = 0; counter < aRow->cValues; counter++) diff --git a/OpenChange/RTFHandler.m b/OpenChange/RTFHandler.m index 801159552..6d3a225b4 100644 --- a/OpenChange/RTFHandler.m +++ b/OpenChange/RTFHandler.m @@ -539,6 +539,7 @@ const unsigned short ansicpg874[256] = { fontTable = [[[RTFFontTable alloc] init] autorelease]; fontName = nil; + fontInfo = nil; count = 0; do @@ -723,6 +724,7 @@ const unsigned short ansicpg874[256] = { fontTable = nil; colorTable = nil; charset = NULL; + formattingOptions = nil; _html = [[NSMutableData alloc] init]; [_html appendBytes: "" length: 34];