Merge pull request #69 from Zentyal/jgarcia/ignore-unhandled-properties
Ignore unhandled properties instead of abortpull/69/head
commit
b5369530f0
|
@ -256,6 +256,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
|
||||||
{
|
{
|
||||||
cValue = aRow->lpProps + counter;
|
cValue = aRow->lpProps + counter;
|
||||||
value = NSObjectFromSPropValue (cValue);
|
value = NSObjectFromSPropValue (cValue);
|
||||||
|
if (value == nil)
|
||||||
|
continue;
|
||||||
|
|
||||||
switch (cValue->ulPropTag & 0xffff)
|
switch (cValue->ulPropTag & 0xffff)
|
||||||
{
|
{
|
||||||
case PT_STRING8:
|
case PT_STRING8:
|
||||||
|
|
|
@ -154,8 +154,7 @@ NSObjectFromMAPISPropValue (const struct mapi_SPropValue *value)
|
||||||
// #define PT_I8 0x14
|
// #define PT_I8 0x14
|
||||||
// #define PT_SRESTRICT 0xFD
|
// #define PT_SRESTRICT 0xFD
|
||||||
// #define PT_ACTIONS 0xFE
|
// #define PT_ACTIONS 0xFE
|
||||||
result = [NSNull null];
|
result = nil;
|
||||||
abort();
|
|
||||||
NSLog (@"%s: object type not handled: %d (0x%.4x)",
|
NSLog (@"%s: object type not handled: %d (0x%.4x)",
|
||||||
__PRETTY_FUNCTION__, valueType, valueType);
|
__PRETTY_FUNCTION__, valueType, valueType);
|
||||||
}
|
}
|
||||||
|
@ -250,8 +249,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
|
||||||
// #define PT_I8 0x14
|
// #define PT_I8 0x14
|
||||||
// #define PT_SRESTRICT 0xFD
|
// #define PT_SRESTRICT 0xFD
|
||||||
// #define PT_ACTIONS 0xFE
|
// #define PT_ACTIONS 0xFE
|
||||||
result = [NSNull null];
|
result = nil;
|
||||||
abort();
|
|
||||||
NSLog (@"%s: object type not handled: %d (0x%.4x)",
|
NSLog (@"%s: object type not handled: %d (0x%.4x)",
|
||||||
__PRETTY_FUNCTION__, valueType, valueType);
|
__PRETTY_FUNCTION__, valueType, valueType);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue