LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #69 from Zentyal/jgarcia/ignore-unhandled-properties 

Ignore unhandled properties instead of abort
pull/69/head
Enrique J. Hernández 2014-12-30 12:31:16 +01:00
parent 3ef28b390d 838ae8995f
commit b5369530f0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenChange/MAPIStoreObject.m
View File

@ -256,6 +256,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
{
cValue = aRow->lpProps + counter;
value = NSObjectFromSPropValue (cValue);
if (value == nil)
continue;
switch (cValue->ulPropTag & 0xffff)
{
case PT_STRING8:

6
OpenChange/MAPIStoreTypes.m
View File

@ -154,8 +154,7 @@ NSObjectFromMAPISPropValue (const struct mapi_SPropValue *value)
// #define PT_I8 0x14
// #define PT_SRESTRICT 0xFD
// #define PT_ACTIONS 0xFE
result = [NSNull null];
abort();
result = nil;
NSLog (@"%s: object type not handled: %d (0x%.4x)",
__PRETTY_FUNCTION__, valueType, valueType);
}
@ -250,8 +249,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
// #define PT_I8 0x14
// #define PT_SRESTRICT 0xFD
// #define PT_ACTIONS 0xFE
result = [NSNull null];
abort();
result = nil;
NSLog (@"%s: object type not handled: %d (0x%.4x)",
__PRETTY_FUNCTION__, valueType, valueType);
}